modforge-cli 0.2.8__tar.gz → 0.2.9__tar.gz

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modforge-cli
-Version: 0.2.8
+Version: 0.2.9
 Summary: ModForge-CLI — a Modrinth-based Minecraft modpack builder
 License: MIT
 License-File: LICENSE

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "modforge-cli"
-version = "0.2.8"
+version = "0.2.9"
 description = "ModForge-CLI — a Modrinth-based Minecraft modpack builder"
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/src/modforge_cli/__version__.py

@@ -1,5 +1,5 @@
 """
 Auto-generated file. DO NOT EDIT.
 """
-__version__ = "0.2.8"
+__version__ = "0.2.9"
 __author__ = "Frank1o3"

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/src/modforge_cli/cli/modpack.py

@@ -61,7 +61,14 @@ def add(name: str, project_type: str = "mod", pack_name: str | None = None) -> N
 
 
 @app.command()
-def resolve(pack_name: str | None = None) -> None:
+def resolve(
+    pack_name: str | None = None,
+    include_optional: bool = typer.Option(
+        False,
+        "--include-optional",
+        help="Include optional dependencies (e.g., ViaFabric multi-version sub-mods)",
+    ),
+) -> None:
     """Resolve all mod dependencies"""
     api = ModrinthAPIConfig(MODRINTH_API)
 
@@ -87,14 +94,22 @@ def resolve(pack_name: str | None = None) -> None:
         console.print("[red]Could not load manifest[/red]")
         raise typer.Exit(1)
 
-    console.print(f"[cyan]Resolving dependencies for {pack_name}...[/cyan]")
+    if include_optional:
+        console.print(f"[cyan]Resolving dependencies for {pack_name} (including optional)...[/cyan]")
+    else:
+        console.print(f"[cyan]Resolving dependencies for {pack_name} (required only)...[/cyan]")
+        console.print("[dim]Tip: Use --include-optional to add optional dependencies[/dim]")
 
     policy = ModPolicy(POLICY_PATH)
     resolver = ModResolver(
-        policy=policy, api=api, mc_version=manifest.minecraft, loader=manifest.loader
+        policy=policy,
+        api=api,
+        mc_version=manifest.minecraft,
+        loader=manifest.loader,
+        include_optional_deps=include_optional,
     )
 
-    async def do_resolve():
+    async def do_resolve() -> set[str]:
         async with await get_api_session() as session:
             return await resolver.resolve(manifest.mods, session)
 

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/src/modforge_cli/core/downloader.py

@@ -69,9 +69,9 @@ class ModDownloader:
 
         def version_score(v: Any) -> tuple[int, str]:
             vtype = version_priority.get(v.get("version_type", "alpha"), 0)
-            # Use version id as proxy for date (IDs are timestamp-based)
-            vid = v.get("id", "")
-            return (vtype, vid)
+            # Use date_published for chronological ordering (ISO 8601, sortable)
+            vdate = v.get("date_published", "") or ""
+            return (vtype, str(vdate))
 
         # Filter compatible versions
         compatible = []

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/src/modforge_cli/core/models.py

@@ -55,6 +55,7 @@ class ProjectVersion(BaseAPIModel):
     files: list[File] = Field(default_factory=list)
     game_versions: list[str] = Field(default_factory=list)
     loaders: list[str] = Field(default_factory=list)
+    date_published: str | None = None
 
     @property
     def is_release(self) -> bool:

{modforge_cli-0.2.8 → modforge_cli-0.2.9}/src/modforge_cli/core/resolver.py

@@ -28,11 +28,13 @@ class ModResolver:
         api: ModrinthAPIConfig,
         mc_version: str,
         loader: str,
+        include_optional_deps: bool = False,
     ) -> None:
         self.policy = policy
         self.api = api
         self.mc_version = mc_version
         self.loader = loader
+        self.include_optional_deps = include_optional_deps
 
         self._headers = {"User-Agent": f"{__author__}/ModForge-CLI/{__version__}"}
 
@@ -48,8 +50,9 @@ class ModResolver:
 
         def version_score(v: ProjectVersion) -> tuple[int, str]:
             vtype = version_priority.get(v.version_type, 0)
-            # Use version id as proxy for date (IDs are timestamp-based)
-            return (vtype, v.id)
+            # Use date_published for chronological ordering (ISO 8601, sortable)
+            vdate = v.date_published or ""
+            return (vtype, vdate)
 
         # Filter compatible versions
         compatible = [
@@ -60,7 +63,7 @@ class ModResolver:
         if not compatible:
             return None
 
-        # Sort by version type (release > beta > alpha), then by ID (newest first)
+        # Sort by version type (release > beta > alpha), then by date (newest first)
         compatible.sort(key=version_score, reverse=True)
         return compatible[0]
 
@@ -231,9 +234,13 @@ class ModResolver:
                             f"(conflicts with '{pid}')[/yellow]"
                         )
 
-                    if dtype in ("required", "optional") and dep_id not in resolved:
+                    if dtype == "required" and dep_id not in resolved:
                         resolved.add(dep_id)
                         queue.append(dep_id)
+                    elif dtype == "optional" and self.include_optional_deps and dep_id not in resolved:
+                        resolved.add(dep_id)
+                        queue.append(dep_id)
+                        console.print(f"[dim]  + Optional dep added: {dep_id}[/dim]")
 
         # Report failed slugs
         if failed_slugs: