fix(app): remove duplicate workspace path logic

Author: skulidropek

packages/app/src/docker-git/cli/parser-clone.ts

@@ -5,26 +5,19 @@ import type { RawOptions } from "@effect-template/lib/core/command-options"
 import {
   type Command,
   defaultTemplateConfig,
-  deriveRepoPathParts,
   type ParseError,
   resolveRepoInput
 } from "@effect-template/lib/core/domain"
 
 import { parseRawOptions } from "./parser-options.js"
-import { splitPositionalRepo } from "./parser-shared.js"
-
-const resolveCloneRepoPath = (resolvedRepo: ReturnType<typeof resolveRepoInput>): string => {
-  const baseParts = deriveRepoPathParts(resolvedRepo.repoUrl).pathParts
-  const projectParts = resolvedRepo.workspaceSuffix ? [...baseParts, resolvedRepo.workspaceSuffix] : baseParts
-  return projectParts.join("/")
-}
+import { resolveWorkspaceRepoPath, splitPositionalRepo } from "./parser-shared.js"
 
 const applyCloneDefaults = (
   raw: RawOptions,
   rawRepoUrl: string,
   resolvedRepo: ReturnType<typeof resolveRepoInput>
 ): RawOptions => {
-  const repoPath = resolveCloneRepoPath(resolvedRepo)
+  const repoPath = resolveWorkspaceRepoPath(resolvedRepo)
   const sshUser = raw.sshUser?.trim() ?? defaultTemplateConfig.sshUser
   const homeDir = `/home/${sshUser}`
   return {

packages/app/src/docker-git/cli/parser-shared.ts

@@ -9,6 +9,14 @@ type PositionalRepo = {
   readonly restArgs: ReadonlyArray<string>
 }
 
+export const resolveWorkspaceRepoPath = (
+  resolvedRepo: ReturnType<typeof resolveRepoInput>
+): string => {
+  const baseParts = deriveRepoPathParts(resolvedRepo.repoUrl).pathParts
+  const projectParts = resolvedRepo.workspaceSuffix ? [...baseParts, resolvedRepo.workspaceSuffix] : baseParts
+  return projectParts.join("/")
+}
+
 export const splitPositionalRepo = (args: ReadonlyArray<string>): PositionalRepo => {
   const first = args[0]
   const positionalRepoUrl = first !== undefined && !first.startsWith("-") ? first : undefined
@@ -24,16 +32,7 @@ export const parseProjectDirWithOptions = (
     const { positionalRepoUrl, restArgs } = splitPositionalRepo(args)
     const raw = yield* _(parseRawOptions(restArgs))
     const rawRepoUrl = raw.repoUrl ?? positionalRepoUrl
-    const resolvedRepo = rawRepoUrl ? resolveRepoInput(rawRepoUrl) : null
-    const repoPath = resolvedRepo
-      ? (() => {
-          const baseParts = deriveRepoPathParts(resolvedRepo.repoUrl).pathParts
-          const projectParts = resolvedRepo.workspaceSuffix
-            ? [...baseParts, resolvedRepo.workspaceSuffix]
-            : baseParts
-          return projectParts.join("/")
-        })()
-      : null
+    const repoPath = rawRepoUrl ? resolveWorkspaceRepoPath(resolveRepoInput(rawRepoUrl)) : null
     const projectDir = raw.projectDir ??
       (repoPath
         ? `.docker-git/${repoPath}`