xgic-payload-cms-cli 0.2.3__tar.gz → 0.2.5__tar.gz

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: xgic-payload-cms-cli
-Version: 0.2.3
+Version: 0.2.5
 Summary: XGIC CLI Payload CMS module - product commands and helpers (xgic.cli.payload).
 Project-URL: Homepage, https://github.com/xgic/payload-cms-cli
 Project-URL: Repository, https://github.com/xgic/payload-cms-cli
@@ -90,7 +90,7 @@ One brand (`xgic`), clear ownership, and dry-run-friendly destructive paths.
 uv pip install \
   "xgic-cli>=0.2.0,<0.3" \
   "xgic-dev-cli>=0.2.0,<0.3" \
-  "xgic-payload-cms-cli>=0.2.3,<0.3"
+  "xgic-payload-cms-cli>=0.2.5,<0.3"
 xgic payload --help
 ```
 

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/README.md

@@ -55,7 +55,7 @@ One brand (`xgic`), clear ownership, and dry-run-friendly destructive paths.
 uv pip install \
   "xgic-cli>=0.2.0,<0.3" \
   "xgic-dev-cli>=0.2.0,<0.3" \
-  "xgic-payload-cms-cli>=0.2.3,<0.3"
+  "xgic-payload-cms-cli>=0.2.5,<0.3"
 xgic payload --help
 ```
 

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "xgic-payload-cms-cli"
-version = "0.2.3"
+version = "0.2.5"
 description = "XGIC CLI Payload CMS module - product commands and helpers (xgic.cli.payload)."
 readme = "README.md"
 license = { text = "Apache-2.0" }

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/__init__.py

@@ -21,7 +21,7 @@ from xgic.cli.payload.project import (
     load_create_payload_config,
 )
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 
 __all__ = [
     "DEFAULT_COMPOSE_PROJECT",

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/commands/reset.py

@@ -3,23 +3,31 @@
 from __future__ import annotations
 
 import shutil
-from pathlib import Path
 
 from xgic.cli.app import CommandContext
 from xgic.cli.payload.config import (
     get_db_config,
     get_db_profile,
-    get_payload_project_name,
     make_payload_docker_controller,
 )
 from xgic.cli.payload.env_helpers import perform_env_regenerate
-from xgic.cli.payload.project import ensure_payload_project
+from xgic.cli.payload.layout import (
+    display_project_location,
+    is_workspace_root,
+    resolve_project_dir,
+)
+from xgic.cli.payload.project import (
+    ensure_payload_project,
+    load_create_payload_config,
+)
 from xgic.cli.utils.output import print_info, print_success, print_warning
 
 
 def run_reset(ctx: CommandContext) -> int:
     """Delete generated project folder and reset the active DB volume.
 
+    Uses ``projectDir`` (same resolver as setup), not ``projectName``.
+    App-root layout (workspace ``.``) is never ``rmtree``'d.
     Credentials in ``.env`` are left alone unless ``--rotate-credentials``.
     """
     dry_run = bool(getattr(ctx.args, "dry_run", False))
@@ -27,13 +35,20 @@ def run_reset(ctx: CommandContext) -> int:
     rotate = bool(getattr(ctx.args, "rotate_credentials", False))
 
     docker = make_payload_docker_controller(ctx.env)
-    payload_project = get_payload_project_name()
-    project_path = Path(payload_project)
+    project_dir = resolve_project_dir(load_create_payload_config())
+    skip_dir = is_workspace_root(project_dir)
+    location = display_project_location(project_dir)
     db_service = get_db_profile()
     db_volume = docker.db_volume_name(db_service)
 
     print_info("Planned actions for reset:")
-    print_info(f"  - Delete directory: {project_path}")
+    if skip_dir:
+        print_info(
+            "  - Skip project directory delete "
+            f"({location} is the workspace; not removing .git / .devcontainer)"
+        )
+    else:
+        print_info(f"  - Delete directory: {location}")
     print_info(f"  - Remove Docker volume: {db_volume}")
     if rotate:
         print_warning("  - ALSO rotate database credentials (DANGEROUS)")
@@ -50,11 +65,16 @@ def run_reset(ctx: CommandContext) -> int:
 
     print_info("Performing reset...")
 
-    if project_path.exists():
-        shutil.rmtree(project_path)
-        print_success(f"Deleted project directory: {project_path}")
+    if skip_dir:
+        print_info(
+            "App-root layout: left workspace files in place. "
+            "Remove generated app sources manually if you need a clean scaffold."
+        )
+    elif project_dir.exists():
+        shutil.rmtree(project_dir)
+        print_success(f"Deleted project directory: {location}")
     else:
-        print_info(f"Project directory {project_path} did not exist.")
+        print_info(f"Project directory {location} did not exist.")
 
     docker.rm_service(db_service, force=True, stop=True, remove_volumes=False)
 

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/config.py

@@ -191,8 +191,10 @@ def db_ready(
         except Exception:
             return False
 
-    _, db_user = get_db_config(config_file)
+    db_name, db_user = get_db_config(config_file)
     try:
+        # -d is required: libpq defaults the database name to the user
+        # (POSTGRES_USER=payload) while POSTGRES_DB is payload_db.
         result = docker._run_compose(  # noqa: SLF001
             "exec",
             "-T",
@@ -200,6 +202,8 @@ def db_ready(
             "pg_isready",
             "-U",
             db_user,
+            "-d",
+            db_name,
             capture_output=True,
             check=False,
         )

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/env_helpers.py

@@ -53,9 +53,14 @@ DATABASE_URL=mongodb://{db_user}:{mongo_pass}@mongodb:27017/{db_name}?authSource
 """
 
     pg_pass = secrets.token_hex(16)
+    # PGUSER/PGDATABASE are libpq defaults. Without them, `pg_isready -U payload`
+    # and other clients open a database named after the user (`payload`) while
+    # POSTGRES_DB is `payload_db`.
     return f"""POSTGRES_USER={db_user}
 POSTGRES_PASSWORD={pg_pass}
 POSTGRES_DB={db_name}
+PGUSER={db_user}
+PGDATABASE={db_name}
 PAYLOAD_SECRET={payload_secret}
 DATABASE_URL=postgres://{db_user}:{pg_pass}@postgres:5432/{db_name}
 """

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/layout.py

@@ -83,8 +83,13 @@ def create_payload_target_arg(project_dir: Path) -> str:
     return project_dir.as_posix().strip("/")
 
 
+def is_workspace_root(project_dir: Path) -> bool:
+    """Return True when *project_dir* is the workspace root (app-root layout)."""
+    return project_dir == Path(".") or str(project_dir).strip() in (".", "./", "")
+
+
 def display_project_location(project_dir: Path) -> str:
     """Human-readable location for logs."""
-    if project_dir == Path("."):
+    if is_workspace_root(project_dir):
         return "workspace root (.)"
     return f"{project_dir.as_posix()}/"

{xgic_payload_cms_cli-0.2.3 → xgic_payload_cms_cli-0.2.5}/src/xgic/cli/payload/project.py

@@ -100,6 +100,25 @@ def pnpx_allow_build_args(
     return [f"--allow-build={name}" for name in packages]
 
 
+def detect_pnpm_major() -> int | None:
+    """Return the major version of ``pnpm`` on PATH, or None if unknown."""
+    try:
+        result = subprocess.run(
+            ["pnpm", "--version"],
+            check=False,
+            capture_output=True,
+            text=True,
+        )
+    except OSError:
+        return None
+    if result.returncode != 0:
+        return None
+    first = result.stdout.strip().split(".", 1)[0]
+    if first.isdigit():
+        return int(first)
+    return None
+
+
 def merge_package_json_only_built(
     text: str, names: tuple[str, ...] = NATIVE_PNPM_BUILDS
 ) -> str:
@@ -117,6 +136,41 @@ def merge_package_json_only_built(
     return json.dumps(data, indent=2) + "\n"
 
 
+def strip_package_json_only_built(text: str) -> str:
+    """Remove ``pnpm.onlyBuiltDependencies`` (pnpm 11+ ignores that field)."""
+    data = json.loads(text)
+    pnpm = data.get("pnpm")
+    if not isinstance(pnpm, dict) or "onlyBuiltDependencies" not in pnpm:
+        return text
+    pnpm.pop("onlyBuiltDependencies", None)
+    if pnpm:
+        data["pnpm"] = pnpm
+    else:
+        data.pop("pnpm", None)
+    return json.dumps(data, indent=2) + "\n"
+
+
+def yaml_map_key(name: str) -> str:
+    """Quote YAML mapping keys that are not plain scalars (e.g. ``@swc/core``)."""
+    if not name or name[0] in "@`&*!|>%{}[]'\"" or any(
+        ch in name for ch in ":#"
+    ):
+        return json.dumps(name)
+    return name
+
+
+def parse_yaml_map_key(raw: str) -> str:
+    """Strip optional YAML quotes from a mapping key token."""
+    raw = raw.strip()
+    if len(raw) >= 2 and raw[0] == raw[-1] and raw[0] in "\"'":
+        return raw[1:-1]
+    return raw
+
+
+def _allow_builds_block(names: list[str]) -> list[str]:
+    return ["allowBuilds:"] + [f"  {yaml_map_key(n)}: true" for n in names]
+
+
 def merge_workspace_allow_builds(
     text: str, names: tuple[str, ...] = NATIVE_PNPM_BUILDS
 ) -> str:
@@ -124,6 +178,7 @@ def merge_workspace_allow_builds(
 
     Avoids a YAML dependency: only handles the generated website-template
     shape (a top-level ``allowBuilds:`` mapping of ``name: true``).
+    Always re-emits the block so unquoted ``@`` keys from 0.2.3 are repaired.
     """
     normalized = text if text.endswith("\n") or text == "" else text + "\n"
     lines = normalized.splitlines()
@@ -132,7 +187,7 @@ def merge_workspace_allow_builds(
         None,
     )
     if start is None:
-        extra = ["allowBuilds:"] + [f"  {n}: true" for n in names]
+        extra = _allow_builds_block(list(names))
         return normalized + "\n".join(extra) + "\n"
 
     existing: list[str] = []
@@ -143,35 +198,46 @@ def merge_workspace_allow_builds(
             end += 1
             continue
         if ln.startswith(" ") or ln.startswith("\t"):
-            existing.append(ln.strip().split(":", 1)[0].strip())
+            key_raw = ln.strip().split(":", 1)[0]
+            existing.append(parse_yaml_map_key(key_raw))
             end += 1
             continue
         break
-    missing = [n for n in names if n not in existing]
-    if not missing:
-        return normalized
-    insert = [f"  {n}: true" for n in missing]
-    new_lines = lines[:end] + insert + lines[end:]
+    merged = list(dict.fromkeys([*existing, *names]))
+    block = _allow_builds_block(merged)
+    new_lines = lines[:start] + block + lines[end:]
     return "\n".join(new_lines) + "\n"
 
 
 def ensure_native_pnpm_builds(
     project_dir: Path, *, quiet: bool = False
 ) -> None:
-    """Allow-list native install scripts in a generated Payload CMS app."""
+    """Allow-list native install scripts in a generated Payload CMS app.
+
+    pnpm 10 reads ``package.json#pnpm.onlyBuiltDependencies``. pnpm 11+
+    ignores that field and uses ``pnpm-workspace.yaml`` ``allowBuilds``.
+    """
     changed = False
     workspace = project_dir / "pnpm-workspace.yaml"
     package_json = project_dir / "package.json"
+    major = detect_pnpm_major()
     try:
-        if workspace.is_file():
-            old = workspace.read_text(encoding="utf-8")
+        if workspace.is_file() or (major is not None and major >= 11):
+            old = (
+                workspace.read_text(encoding="utf-8")
+                if workspace.is_file()
+                else ""
+            )
             new = merge_workspace_allow_builds(old)
             if new != old:
                 workspace.write_text(new, encoding="utf-8")
                 changed = True
         if package_json.is_file():
             old = package_json.read_text(encoding="utf-8")
-            new = merge_package_json_only_built(old)
+            if major is not None and major >= 11:
+                new = strip_package_json_only_built(old)
+            else:
+                new = merge_package_json_only_built(old)
             if new != old:
                 package_json.write_text(new, encoding="utf-8")
                 changed = True