added new project cli with custom json reading

src/foreignthon/cli.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import subprocess
 import sys
 from pathlib import Path
 
@@ -12,6 +13,64 @@ from .transpiler import run_transpiled, transpile_file
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
 
+def _load_effective_pack(project: Path, lang: str) -> dict:
+    """
+    Load installed pack then merge local custom.json on top if configured.
+    Walks up from project to find .foreignthon.toml.
+    """
+    import json
+    from .pack import load_pack
+
+    pack = load_pack(lang)
+
+    # Walk up directories to find .foreignthon.toml
+    search = project if project.is_dir() else project.parent
+    toml_path = None
+    for parent in [search, *search.parents]:
+        candidate = parent / ".foreignthon.toml"
+        if candidate.exists():
+            toml_path = candidate
+            break
+
+    if toml_path:
+        for line in toml_path.read_text(encoding="utf-8").splitlines():
+            if line.strip().startswith("custom_pack"):
+                custom_path = toml_path.parent / line.split("=", 1)[1].strip().strip('"').strip("'")
+                if custom_path.exists():
+                    custom = json.loads(custom_path.read_text(encoding="utf-8"))
+                    for section in ("keywords", "builtins", "exceptions", "stdlib", "error_messages"):
+                        if section in custom:
+                            pack[section] = {**pack.get(section, {}), **custom[section]}
+                    if "postfix_keywords" in custom:
+                        pack["postfix_keywords"] = custom["postfix_keywords"]
+                break
+
+    return pack
+
+
+def _pick(mapping: dict, english: str, fallback: str) -> str:
+    reverse = {v: k for k, v in mapping.items()}
+    return reverse.get(english, fallback)
+
+
+def _git_init(project: Path) -> None:
+    git_ok = subprocess.run(["git", "--version"], capture_output=True).returncode == 0
+    if git_ok:
+        subprocess.run(["git", "init"], cwd=project, capture_output=True)
+        subprocess.run(["git", "add", "."], cwd=project, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", "initial commit"],
+            cwd=project, capture_output=True,
+        )
+
+
+def _lang_from_file(path: Path) -> str:
+    suffixes = path.suffixes
+    if len(suffixes) >= 2 and suffixes[-1] == ".py":
+        return suffixes[-2].lstrip(".")
+    return "en"
+
+
 @click.group(context_settings=CONTEXT_SETTINGS)
 @click.version_option(__version__, prog_name="fpy")
 def main():
@@ -19,6 +78,95 @@ def main():
     pass
 
 
+@main.command(context_settings=CONTEXT_SETTINGS)
+@click.argument("name", default="")
+@click.option("--lang", "-l", required=True, help="Language code (e.g. es, ta)")
+@click.option("--no-git", is_flag=True, help="Skip git init")
+def new(name: str, lang: str, no_git: bool):
+    """
+    Create a new ForeignThon project.
+
+    \b
+    fpy new myproject --lang es     # creates myproject/
+    fpy new --lang es               # initializes current directory
+    """
+    from .pack import PackNotFoundError
+
+    if name:
+        project = Path(name)
+        if project.exists():
+            click.echo(f"✗ '{name}' already exists.", err=True)
+            raise SystemExit(1)
+        project.mkdir(parents=True)
+    else:
+        project = Path.cwd()
+        if any(project.iterdir()):
+            click.echo("✗ Current directory is not empty.", err=True)
+            raise SystemExit(1)
+
+    try:
+        pack = _load_effective_pack(project, lang)
+    except PackNotFoundError:
+        click.echo(f"✗ Language pack '{lang}' not installed.", err=True)
+        click.echo(f"  Run: pip install foreignthon-{lang}", err=True)
+        raise SystemExit(1)
+
+    lang_name = pack["meta"]["native_name"]
+
+    (project / ".foreignthon.toml").write_text(
+        f'[foreignthon]\n'
+        f'lang = "{lang}"\n'
+        f'\n'
+        f'# Optional: path to a local JSON that overrides pack keywords\n'
+        f'# custom_pack = "custom.json"\n',
+        encoding="utf-8",
+    )
+
+    (project / ".gitignore").write_text(
+        "__pycache__/\n"
+        "*.py[cod]\n"
+        "*.egg-info/\n"
+        "dist/\n"
+        "build/\n"
+        ".venv/\n"
+        ".pytest_cache/\n"
+        ".DS_Store\n"
+        "Thumbs.db\n",
+        encoding="utf-8",
+    )
+
+    src = project / "src"
+    src.mkdir(exist_ok=True)
+
+    bi_print = _pick(pack["builtins"], "print", "print")
+    (src / f"main.{lang}.py").write_text(
+        f"# Hello, World! in {lang_name}\n"
+        f'{bi_print}("Hello, World!")\n',
+        encoding="utf-8",
+    )
+
+    (project / "README.md").write_text(
+        f"# {name or project.name}\n\n"
+        f"A ForeignThon project in {lang_name}.\n\n"
+        f"## Run\n\n"
+        f"```bash\n"
+        f"fpy run src/main.{lang}.py\n"
+        f"```\n\n"
+        f"## Custom pack override\n\n"
+        f"Create a `custom.json` and set `custom_pack = \"custom.json\"` "
+        f"in `.foreignthon.toml` to add or override keywords locally.\n",
+        encoding="utf-8",
+    )
+
+    if not no_git:
+        _git_init(project)
+
+    click.echo(f"✓ Created '{name or '.'}' [{lang_name}]")
+    if name:
+        click.echo(f"  cd {name}")
+    click.echo(f"  fpy run src/main.{lang}.py")
+
+
 @main.command(context_settings=CONTEXT_SETTINGS)
 @click.argument("file", type=click.Path(exists=True, path_type=Path))
 @click.option("--lang", "-l", default=None, help="Override language code (e.g. es, ta)")
@@ -34,7 +182,8 @@ def run(file: Path, lang: str | None, keep: bool):
     detected_lang = lang or _lang_from_file(file)
     activate(detected_lang)
 
-    transpiled = transpile_file(file)
+    pack = _load_effective_pack(file, detected_lang)
+    transpiled = transpile_file(file, pack=pack)
 
     if keep:
         out_path = file.with_suffix("").with_suffix(".compiled.py")
@@ -54,14 +203,14 @@ def compile(file: Path, output: str | None):
     """
     Transpile a foreign-language file to standard Python.
 
-    Output can be a file path or a directory:
-
     \b
     fpy compile script.es.py              # → script.compiled.py
     fpy compile script.es.py -o out/      # → out/script.compiled.py
     fpy compile script.es.py -o out.py    # → out.py
     """
-    transpiled = transpile_file(file)
+    detected_lang = _lang_from_file(file)
+    pack = _load_effective_pack(file, detected_lang)
+    transpiled = transpile_file(file, pack=pack)
 
     if output is None:
         out_path = file.with_suffix("").with_suffix(".compiled.py")
@@ -84,8 +233,10 @@ def check(file: Path):
     """Validate a foreign-language file without running it."""
     import ast
 
+    detected_lang = _lang_from_file(file)
     try:
-        transpiled = transpile_file(file)
+        pack = _load_effective_pack(file, detected_lang)
+        transpiled = transpile_file(file, pack=pack)
         ast.parse(transpiled)
         click.echo(f"✓ {file.name} looks good.")
     except SyntaxError as e:
@@ -115,7 +266,6 @@ def validate_pack(json_file: Path):
     click.echo(f"✓ Pack '{data['meta']['name']}' is valid.")
 
 
-
 @main.command(context_settings=CONTEXT_SETTINGS)
 @click.argument("file", type=click.Path(exists=True, path_type=Path))
 @click.option("--lang", "-l", required=True, help="Target language code (e.g. es, ta)")
@@ -125,8 +275,6 @@ def decompile(file: Path, lang: str, postfix: bool, output: str | None):
     """
     Convert standard Python back to a foreign language.
 
-    Keywords and builtins are translated. Variable names are untouched.
-
     \b
     fpy decompile script.py --lang es
     fpy decompile script.py --lang ta --postfix
@@ -134,7 +282,8 @@ def decompile(file: Path, lang: str, postfix: bool, output: str | None):
     """
     from .transpiler import detranspile_file
 
-    result = detranspile_file(file, lang, postfix=postfix)
+    pack = _load_effective_pack(file, lang)
+    result = detranspile_file(file, lang, postfix=postfix, pack=pack)
 
     ext = f".{lang}.py"
 
@@ -152,11 +301,3 @@ def decompile(file: Path, lang: str, postfix: bool, output: str | None):
     out_path.parent.mkdir(parents=True, exist_ok=True)
     out_path.write_text(result, encoding="utf-8")
     click.echo(f"Decompiled: {out_path}")
-
-
-def _lang_from_file(path: Path) -> str:
-    suffixes = path.suffixes
-    if len(suffixes) >= 2 and suffixes[-1] == ".py":
-        return suffixes[-2].lstrip(".")
-    return "en"
-

src/foreignthon/transpiler.py

@@ -63,7 +63,6 @@ def _apply_postfix_output(source: str, en_to_foreign: dict, postfix_english: set
 
 
 def _get_slice(source_lines: list[str], sr: int, sc: int, er: int, ec: int) -> str:
-    """Extract text from source between two (row, col) positions (1-indexed rows)."""
     n = len(source_lines)
     if sr > n:
         return ""
@@ -81,10 +80,6 @@ def _get_slice(source_lines: list[str], sr: int, sc: int, er: int, ec: int) -> s
 
 
 def _swap_tokens(source: str, mapping: dict) -> str:
-    """
-    Swap NAME tokens while copying all inter-token text verbatim from source.
-    This preserves original spacing exactly — no double newlines, no extra spaces.
-    """
     source_lines = source.splitlines(keepends=True)
     tokens = list(tokenize.generate_tokens(io.StringIO(source).readline))
 
@@ -96,12 +91,9 @@ def _swap_tokens(source: str, mapping: dict) -> str:
             break
 
         s_row, s_col = tok_start
-
-        # Copy original whitespace/newlines between tokens verbatim
         gap = _get_slice(source_lines, prev_end[0], prev_end[1], s_row, s_col)
         result.append(gap)
 
-        # Swap or keep token
         if tok_type == tokenize.NAME and tok_string in mapping:
             result.append(mapping[tok_string])
         else:
@@ -112,21 +104,26 @@ def _swap_tokens(source: str, mapping: dict) -> str:
     return "".join(result)
 
 
-def transpile(source: str, lang_code: str) -> str:
+def _build_mapping(pack: dict) -> dict:
-    pack = load_pack(lang_code)
-
     mapping: dict[str, str] = {}
     mapping.update(pack["keywords"])
     mapping.update(pack["builtins"])
     mapping.update(pack["exceptions"])
     mapping.update(pack["stdlib"])
+    return mapping
 
+
+def transpile(source: str, lang_code: str, pack: dict | None = None) -> str:
+    if pack is None:
+        pack = load_pack(lang_code)
+    mapping = _build_mapping(pack)
     source = _apply_postfix_syntax(source, mapping)
     return _swap_tokens(source, mapping)
 
 
-def detranspile(source: str, lang_code: str, postfix: bool = False) -> str:
+def detranspile(source: str, lang_code: str, postfix: bool = False, pack: dict | None = None) -> str:
-    pack = load_pack(lang_code)
+    if pack is None:
+        pack = load_pack(lang_code)
 
     en_to_foreign: dict[str, str] = {}
     for section in ("keywords", "builtins", "exceptions", "stdlib"):
@@ -142,16 +139,16 @@ def detranspile(source: str, lang_code: str, postfix: bool = False) -> str:
     return output
 
 
-def transpile_file(path: Path) -> str:
+def transpile_file(path: Path, pack: dict | None = None) -> str:
     lang_code = _detect_lang(path)
     source = path.read_text(encoding="utf-8")
     lang_code = _check_shebang(source, lang_code)
-    return transpile(source, lang_code)
+    return transpile(source, lang_code, pack=pack)
 
 
-def detranspile_file(path: Path, lang_code: str, postfix: bool = False) -> str:
+def detranspile_file(path: Path, lang_code: str, postfix: bool = False, pack: dict | None = None) -> str:
     source = path.read_text(encoding="utf-8")
-    return detranspile(source, lang_code, postfix=postfix)
+    return detranspile(source, lang_code, postfix=postfix, pack=pack)
 
 
 def run_transpiled(original_path: Path, transpiled: str) -> None: