jac-client 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

jac_client/plugin/cli.jac

@@ -1,7 +1,7 @@
 """Command line interface tool for the Jac Client.
 
 This module extends the core `create` command to add client-side (frontend)
-project setup via the --cl flag.
+project setup via the --cl flag using the extend_command API.
 """
 
 import os;
@@ -10,112 +10,82 @@ import sys;
 import pathlib;
 import subprocess;
 import shutil;
-import from jaclang.cli.cmdreg { cmd_registry, CommandPriority }
+import from jaclang.cli.registry { get_registry }
+import from jaclang.cli.command { Arg, ArgKind, HookContext }
 import from jaclang.pycore.runtime { hookimpl }
-import from jaclang.project.config { JacConfig, find_project_root }
+import from jaclang.project.config { find_project_root }
 
 """Jac CLI extensions for client-side development."""
 class JacCmd {
     """Create Jac CLI cmds."""
     @hookimpl
     static def create_cmd -> None {
-        """Override core create command to add --cl flag for client-side setup.""";
-
-        def create(
-            name: str = 'main',
-            force: bool = False,
-            cl: bool = False,
-            skip: bool = False,
-            verbose: bool = False
-        ) -> None {
-            """Initialize a new Jac project.
-
-            Creates a jac.toml configuration file and basic project structure.
-            Use --cl to include client-side (frontend) setup with Vite bundling.
-
-            Args:
-                name: Project name (default: 'main')
-                force: Overwrite existing jac.toml if present
-                cl: Include client-side (frontend) setup
-                skip: Skip installing default packages (only for --cl projects)
-                verbose: Show detailed output during package installation
-
-            Examples:
-                jac create
-                jac create myapp
-                jac create --cl myapp
-                jac create --cl --skip myapp
-                jac create --cl --verbose myapp
-                jac create --force
-            """;
-            cwd = pathlib.Path(os.getcwd());
-
-            if cl {
-                _create_client_project(cwd, name, force, skip, verbose);
-            } else {
-                _create_core_project(cwd, name, force);
-            }
-        }
-
-        # Register with PLUGIN priority to override core's create command
-        cmd_registry.register(
-            create, priority=CommandPriority.PLUGIN, source="jac-client"
+        """Extend core create command to add --cl flag for client-side setup.""";
+        registry = get_registry();
+
+        # Extend the core 'create' command with client-specific arguments
+        registry.extend_command(
+            command_name="create",
+            args=[
+                Arg.create(
+                    "cl",
+                    typ=bool,
+                    default=False,
+                    help="Include client-side (frontend) setup",
+                    short="c"
+                ),
+                Arg.create(
+                    "skip",
+                    typ=bool,
+                    default=False,
+                    help="Skip installing default packages (only for --cl)",
+                    short="s"
+                ),
+                Arg.create(
+                    "verbose",
+                    typ=bool,
+                    default=False,
+                    help="Show detailed output during installation",
+                    short="v"
+                ),
+
+            ],
+            pre_hook=_handle_client_create,
+            source="jac-client"
         );
     }
 }
 
-"""Create a standard Jac project (core behavior)."""
-def _create_core_project(cwd: pathlib.Path, name: str, force: bool) -> None {
-    existing = find_project_root(cwd);
-    if existing and not force {
-        (project_root, toml_path) = existing;
-        print(f"Already in a Jac project: {toml_path}", file=sys.stderr);
-        print("Use --force to reinitialize.", file=sys.stderr);
-        <>exit(1);
+"""Pre-hook to handle --cl flag for client-side project creation."""
+def _handle_client_create(ctx: HookContext) -> None {
+    # Check if --cl flag is set
+    cl_flag = ctx.get_arg("cl", False);
+    if not cl_flag {
+        # Let core create command run normally
+        return;
     }
 
-    project_name = name or cwd.name;
-
-    toml_path = cwd / "jac.toml";
-    if toml_path.exists() and not force {
-        print("jac.toml already exists. Use --force to overwrite.", file=sys.stderr);
-        <>exit(1);
-    }
-
-    toml_content = JacConfig.create_default_toml(project_name);
-    with open(toml_path, "w") as f {
-        f.write(toml_content);
-    }
-    print(f"Created {toml_path}");
-
-    main_jac = cwd / f"{name}.jac";
-    if not main_jac.exists() {
-        with open(main_jac, "w") as f {
-            f.write(
-                f'''"""Main entry point for {project_name}."""
-
-with entry {{
-    print("Hello from {project_name}!");
-}}
-'''
-            );
-        }
-        print(f"Created {main_jac}");
-    }
+    # Handle client-side project creation
+    cwd = pathlib.Path(os.getcwd());
+    name = ctx.get_arg("name", "main");
+    force = ctx.get_arg("force", False);
+    skip_install = ctx.get_arg("skip", False);
+    verbose = ctx.get_arg("verbose", False);
 
-    packages_dir = cwd / "packages";
-    if not packages_dir.exists() {
-        packages_dir.mkdir(parents=True, exist_ok=True);
-        print(f"Created {packages_dir}/");
+    try {
+        _create_client_project(cwd, name, force, skip_install, verbose);
+        # Cancel core handler with success code
+        ctx.set_data("cancel_execution", True);
+        ctx.set_data("cancel_return_code", 0);
+    } except SystemExit as e {
+        # Preserve exit code from sys.exit() calls
+        ctx.set_data("cancel_execution", True);
+        ctx.set_data("cancel_return_code", e.code if e.code is not None else 1);
+    } except Exception as e {
+        print(f"Error creating client project: {e}", file=sys.stderr);
+        ctx.set_data("cancel_execution", True);
+        ctx.set_data("cancel_return_code", 1);
     }
-
-    _create_gitignore(cwd, client=False);
-
-    print(f"\nProject '{project_name}' initialized successfully!");
-    print("\nNext steps:");
-    print("  jac run main.jac    # Run the main entry point");
-    print("  jac add <package>   # Add dependencies");
-    print("  jac install         # Install all dependencies");
 }
 
 """Create a client-side Jac project with organized folder structure."""
@@ -166,23 +136,29 @@ def _create_client_project(
 
     print(f"Creating Jac client application: {project_name}");
 
-    src_dir = project_path / "src";
-    src_dir.mkdir(parents=True, exist_ok=True);
-
-    components_dir = src_dir / "components";
+    components_dir = project_path / "components";
     components_dir.mkdir(parents=True, exist_ok=True);
 
     assets_dir = project_path / "assets";
     assets_dir.mkdir(parents=True, exist_ok=True);
 
-    (project_path / ".client-build").mkdir(parents=True, exist_ok=True);
+    (project_path / ".jac" / "client").mkdir(parents=True, exist_ok=True);
 
     toml_path = project_path / "jac.toml";
     toml_content = f'''[project]
 name = "{project_name}"
 version = "1.0.0"
 description = "Jac client application: {project_name}"
-entry-point = "src/app.jac"
+entry-point = "main.jac"
+
+[dependencies.npm]
+"jac-client-node" = "1.0.3"
+
+[dependencies.npm.dev]
+"@jac-client/dev-deps" = "1.0.0"
+
+[serve]
+base_route_app = "app"
 
 [plugins.client]
 # Vite bundler configuration (optional overrides)
@@ -194,16 +170,16 @@ entry-point = "src/app.jac"
     }
     print(f"Created {toml_path}");
 
-    app_jac_content = '''"""Main entry point for the Jac client application."""
+    main_jac_content = '''"""Main entry point for the Jac client application."""
 
-# Client-side imports
-cl import from react { useState, useEffect }
-cl import from ".components/Button.tsx" { Button }
+# Client-side imports (useState is auto-injected when using `has` variables)
+cl import from react { useEffect }
+cl import from .components.Button { Button }
 
 # Client-side component
 cl {
     def:pub app() -> any {
-        [count, setCount] = useState(0);
+        has count: int = 0;
 
         useEffect(lambda -> None {
             console.log("Count updated:", count);
@@ -215,12 +191,12 @@ cl {
             <div style={{display: "flex", gap: "1rem", marginTop: "1rem"}}>
                 <Button
                     label="Increment"
-                    onClick={lambda -> None { setCount(count + 1); }}
+                    onClick={lambda -> None { count = count + 1; }}
                     variant="primary"
                 />
                 <Button
                     label="Reset"
-                    onClick={lambda -> None { setCount(0); }}
+                    onClick={lambda -> None { count = 0; }}
                     variant="secondary"
                 />
             </div>
@@ -228,79 +204,62 @@ cl {
     }
 }
 ''';
-    with open(src_dir / "app.jac", 'w') as f {
-        f.write(app_jac_content);
+    with open(project_path / "main.jac", 'w') as f {
+        f.write(main_jac_content);
     }
-    print("Created src/app.jac");
-
-    button_tsx_content = '''import React from 'react';
-
-interface ButtonProps {
-  label: string;
-  onClick?: () => void;
-  variant?: 'primary' | 'secondary';
-  disabled?: boolean;
-}
+    print("Created main.jac");
+
+    button_cl_jac_content = '''"""Button component for the Jac client application."""
+
+def:pub Button(label: str, onClick: any, variant: str = "primary", disabled: bool = False) -> any {
+    base_styles = {
+        "padding": "0.75rem 1.5rem",
+        "fontSize": "1rem",
+        "fontWeight": "600",
+        "borderRadius": "0.5rem",
+        "border": "none",
+        "cursor": "not-allowed" if disabled else "pointer",
+        "transition": "all 0.2s ease"
+    };
+
+    variant_styles = {
+        "primary": {
+            "backgroundColor": "#9ca3af" if disabled else "#3b82f6",
+            "color": "#ffffff"
+        },
+        "secondary": {
+            "backgroundColor": "#e5e7eb" if disabled else "#6b7280",
+            "color": "#ffffff"
+        }
+    };
 
-export const Button: React.FC<ButtonProps> = ({
-  label,
-  onClick,
-  variant = 'primary',
-  disabled = false
-}) => {
-  const baseStyles: React.CSSProperties = {
-    padding: '0.75rem 1.5rem',
-    fontSize: '1rem',
-    fontWeight: '600',
-    borderRadius: '0.5rem',
-    border: 'none',
-    cursor: disabled ? 'not-allowed' : 'pointer',
-    transition: 'all 0.2s ease',
-  };
-
-  const variantStyles: Record<string, React.CSSProperties> = {
-    primary: {
-      backgroundColor: disabled ? '#9ca3af' : '#3b82f6',
-      color: '#ffffff',
-    },
-    secondary: {
-      backgroundColor: disabled ? '#e5e7eb' : '#6b7280',
-      color: '#ffffff',
-    },
-  };
-
-  return (
-    <button
-      style={{ ...baseStyles, ...variantStyles[variant] }}
-      onClick={onClick}
-      disabled={disabled}
+    return <button
+        style={{**base_styles, **variant_styles[variant]}}
+        onClick={onClick}
+        disabled={disabled}
     >
-      {label}
-    </button>
-  );
-};
-
-export default Button;
+        {label}
+    </button>;
+}
 ''';
-    with open(components_dir / "Button.tsx", 'w') as f {
-        f.write(button_tsx_content);
+    with open(components_dir / "Button.cl.jac", 'w') as f {
+        f.write(button_cl_jac_content);
     }
-    print("Created src/components/Button.tsx");
+    print("Created components/Button.cl.jac");
 
     readme_content = f'''  # {project_name}
 
 
-A Jac client-side application with React and TypeScript support.
+A Jac client-side application with React support.
 
 ## Project Structure
 
 ```
 {project_name}/
 ├── jac.toml              # Project configuration
-├── src/                  # Source files
-│   ├── app.jac           # Main application entry
-│   └── components/       # Reusable components
-│       └── Button.tsx    # Example TypeScript component
+├── main.jac              # Main application entry
+├── components/           # Reusable components
+│   └── Button.cl.jac     # Example Jac component
 ├── assets/               # Static assets (images, fonts, etc.)
 └── build/                # Build output (generated)
 ```
@@ -310,15 +269,15 @@ A Jac client-side application with React and TypeScript support.
 Start the development server:
 
 ```bash
-jac serve src/app.jac
+jac start main.jac
 ```
 
-## TypeScript Support
+## Components
 
-Create TypeScript components in `src/components/` and import them in your Jac files:
+Create Jac components in `components/` as `.cl.jac` files and import them:
 
 ```jac
-cl import from "./components/Button.tsx" {{ Button }}
+cl import from .components.Button {{ Button }}
 ```
 
 ## Adding Dependencies
@@ -334,7 +293,7 @@ jac add --cl react-router-dom
     }
     print("Created README.md");
 
-    _create_gitignore(project_path, client=True);
+    _create_gitignore(project_path);
 
     # Install default packages unless --skip is specified
     if not skip {
@@ -346,15 +305,15 @@ jac add --cl react-router-dom
     if name and name != cwd.name {
         print("\nNext steps:");
         print(f"  cd {name}");
-        print("  jac serve src/app.jac");
+        print("  jac start main.jac");
     } else {
         print("\nNext steps:");
-        print("  jac serve src/app.jac");
+        print("  jac start main.jac");
     }
 }
 
-"""Create .gitignore file with appropriate entries."""
-def _create_gitignore(project_path: pathlib.Path, client: bool = False) -> None {
+"""Create .gitignore file with client-specific entries."""
+def _create_gitignore(project_path: pathlib.Path) -> None {
     gitignore_entries = [
         "# Jac project",
         "packages/",
@@ -372,24 +331,17 @@ def _create_gitignore(project_path: pathlib.Path, client: bool = False) -> None
         "# IDE",
         ".idea/",
         ".vscode/",
-        "*.swp"
+        "*.swp",
+        "",
+        "# Node.js",
+        "node_modules/",
+        "",
+        "# Jac build artifacts",
+        ".jac/",
+        "*.session",
+        "*.session.*"
     ];
 
-    if client {
-        gitignore_entries.extend(
-            [
-                "",
-                "# Node.js",
-                "node_modules/",
-                "",
-                "# Jac Client",
-                ".client-build/",
-                "*.session",
-                "*.session.*"
-            ]
-        );
-    }
-
     gitignore_path = project_path / ".gitignore";
     if gitignore_path.exists() {
         with open(gitignore_path, "r") as f {
@@ -415,7 +367,7 @@ def _create_gitignore(project_path: pathlib.Path, client: bool = False) -> None
     }
 }
 
-"""Install default npm packages in .client-build directory."""
+"""Install default npm packages in .jac/client directory."""
 def _install_default_packages(
     project_path: pathlib.Path, verbose: bool = False
 ) -> None {
@@ -441,13 +393,13 @@ def _install_default_packages(
         # Generate package.json with default packages (defaults are added automatically)
         bundler.create_package_json(project_name=project_name);
 
-        # Ensure .client-build directory exists
-        build_dir = project_path / '.client-build';
-        build_dir.mkdir(parents=True, exist_ok=True);
+        # Ensure .jac/client directory exists
+        client_dir = bundler._get_client_dir();
+        client_dir.mkdir(parents=True, exist_ok=True);
 
-        # Copy package.json to .client-build/ for npm install
-        configs_package_json = build_dir / '.jac-client.configs' / 'package.json';
-        build_package_json = build_dir / 'package.json';
+        # Copy package.json to .jac/client/ for npm install
+        configs_package_json = client_dir / 'configs' / 'package.json';
+        build_package_json = client_dir / 'package.json';
 
         if not configs_package_json.exists() {
             print(
@@ -457,7 +409,7 @@ def _install_default_packages(
             return;
         }
 
-        # Always copy the generated package.json to .client-build/ for npm install
+        # Always copy the generated package.json to .jac/client/ for npm install
         shutil.copy2(configs_package_json, build_package_json);
 
         # Read package data for verbose output
@@ -485,27 +437,27 @@ def _install_default_packages(
             print("\nRunning npm install...");
         }
 
-        # Run npm install in .client-build/ directory
+        # Run npm install in .jac/client/ directory
         try {
             if verbose {
                 # Stream output for visibility in verbose mode
                 subprocess.run(
-                    ['npm', 'install', '--progress'], cwd=build_dir, check=True
+                    ['npm', 'install', '--progress'], cwd=client_dir, check=True
                 );
             } else {
                 # Quiet mode: capture output
                 subprocess.run(
                     ['npm', 'install'],
-                    cwd=build_dir,
+                    cwd=client_dir,
                     check=True,
                     capture_output=True,
                     text=True
                 );
             }
 
-            # Move package-lock.json to .jac-client.configs/ if it was created
-            build_package_lock = build_dir / 'package-lock.json';
-            configs_dir = build_dir / '.jac-client.configs';
+            # Move package-lock.json to configs/ if it was created
+            build_package_lock = client_dir / 'package-lock.json';
+            configs_dir = client_dir / 'configs';
             configs_package_lock = configs_dir / 'package-lock.json';
             if build_package_lock.exists() {
                 configs_dir.mkdir(parents=True, exist_ok=True);
@@ -535,7 +487,7 @@ def _install_default_packages(
             );
             print("You can install packages later with: jac add --cl", file=sys.stderr);
         } finally {
-            # Clean up temporary package.json in .client-build/
+            # Clean up temporary package.json in .jac/client/
             if build_package_json.exists() {
                 build_package_json.unlink();
             }

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 }
 import from 'react-dom/client' { * as ReactDOM }
 import from 'react-router-dom' {
     HashRouter as ReactRouterHashRouter,
@@ -15,7 +16,9 @@ import from 'react-router-dom' {
 
 def : pub __jacJsx(tag: any, props: dict = {}, children: any = []) -> any;
 
-glob : pub Router = ReactRouterHashRouter,
+# React hooks re-exported for auto-injection by `has` variables
+glob : pub useState = reactUseState,
+     Router = ReactRouterHashRouter,
      Routes = ReactRouterRoutes,
      Route = ReactRouterRoute,
      Link = ReactRouterLink,
@@ -36,3 +39,4 @@ def : pub jacIsLoggedIn -> bool;
 def : pub __getLocalStorage(key: str) -> str;
 def : pub __setLocalStorage(key: str, value: str) -> None;
 def : pub __removeLocalStorage(key: str) -> None;
+# React Router components