fix(lib): normalize ~ in docker-git target-dir paths

Author: skulidropek

packages/app/tests/docker-git/parser.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "@effect/vitest"
 import { Effect, Either } from "effect"
 
 import { type Command, defaultTemplateConfig } from "@effect-template/lib/core/domain"
+import { expandContainerHome } from "@effect-template/lib/usecases/scrap-path"
 import { parseArgs } from "../../src/docker-git/cli/parser.js"
 
 type CreateCommand = Extract<Command, { _tag: "Create" }>
@@ -52,6 +53,8 @@ const expectCreateDefaults = (command: CreateCommand) => {
   expect(command.forceEnv).toBe(false)
 }
 
+const expandDefaultTargetDir = (path: string): string => expandContainerHome(defaultTemplateConfig.sshUser, path)
+
 describe("parseArgs", () => {
   it.effect("parses create command with defaults", () =>
     expectCreateCommand(["create", "--repo-url", "https://github.com/org/repo.git"], (command) => {
@@ -83,7 +86,9 @@ describe("parseArgs", () => {
       expectCreateDefaults(command)
       expect(command.openSsh).toBe(true)
       expect(command.waitForClone).toBe(true)
-      expect(command.config.targetDir).toBe("~/.docker-git/workspaces/org/repo")
+      expect(command.config.targetDir).toBe(
+        expandDefaultTargetDir("~/.docker-git/workspaces/org/repo")
+      )
     }))
 
   it.effect("parses clone branch alias", () =>
@@ -118,15 +123,19 @@ describe("parseArgs", () => {
       expect(command.config.repoUrl).toBe("https://github.com/agiens/crm.git")
       expect(command.config.repoRef).toBe("vova-fork")
       expect(command.outDir).toBe(".docker-git/agiens/crm")
-      expect(command.config.targetDir).toBe("~/.docker-git/workspaces/agiens/crm")
+      expect(command.config.targetDir).toBe(
+        expandDefaultTargetDir("~/.docker-git/workspaces/agiens/crm")
+      )
     }))
 
   it.effect("parses GitHub issue url as isolated project + issue branch", () =>
     expectCreateCommand(["clone", "https://github.com/org/repo/issues/5"], (command) => {
       expect(command.config.repoUrl).toBe("https://github.com/org/repo.git")
       expect(command.config.repoRef).toBe("issue-5")
       expect(command.outDir).toBe(".docker-git/org/repo/issue-5")
-      expect(command.config.targetDir).toBe("~/.docker-git/workspaces/org/repo/issue-5")
+      expect(command.config.targetDir).toBe(
+        expandDefaultTargetDir("~/.docker-git/workspaces/org/repo/issue-5")
+      )
       expect(command.config.containerName).toBe("dg-repo-issue-5")
       expect(command.config.serviceName).toBe("dg-repo-issue-5")
       expect(command.config.volumeName).toBe("dg-repo-issue-5-home")
@@ -137,7 +146,9 @@ describe("parseArgs", () => {
       expect(command.config.repoUrl).toBe("https://github.com/org/repo.git")
       expect(command.config.repoRef).toBe("refs/pull/42/head")
       expect(command.outDir).toBe(".docker-git/org/repo/pr-42")
-      expect(command.config.targetDir).toBe("~/.docker-git/workspaces/org/repo/pr-42")
+      expect(command.config.targetDir).toBe(
+        expandDefaultTargetDir("~/.docker-git/workspaces/org/repo/pr-42")
+      )
       expect(command.config.containerName).toBe("dg-repo-pr-42")
       expect(command.config.serviceName).toBe("dg-repo-pr-42")
       expect(command.config.volumeName).toBe("dg-repo-pr-42-home")

packages/lib/src/core/command-builders.ts

@@ -10,6 +10,7 @@ import {
   resolveRepoInput
 } from "./domain.js"
 import { trimRightChar } from "./strings.js"
+import { expandContainerHome } from "../usecases/scrap-path.js"
 
 const parsePort = (value: string): Either.Either<number, ParseError> => {
   const parsed = Number(value)
@@ -71,10 +72,11 @@ const resolveRepoBasics = (raw: RawOptions): Either.Either<RepoBasics, ParseErro
     const repoRef = yield* _(
       nonEmpty("--repo-ref", raw.repoRef ?? resolvedRepo.repoRef, defaultTemplateConfig.repoRef)
     )
-    const targetDir = yield* _(
+    const sshUser = yield* _(nonEmpty("--ssh-user", raw.sshUser, defaultTemplateConfig.sshUser))
+    const rawTargetDir = yield* _(
       nonEmpty("--target-dir", raw.targetDir, defaultTemplateConfig.targetDir)
     )
-    const sshUser = yield* _(nonEmpty("--ssh-user", raw.sshUser, defaultTemplateConfig.sshUser))
+    const targetDir = expandContainerHome(sshUser, rawTargetDir)
     const sshPort = yield* _(parsePort(raw.sshPort ?? String(defaultTemplateConfig.sshPort)))
 
     return { repoUrl, repoSlug, projectSlug, repoPath, repoRef, targetDir, sshUser, sshPort }