fix(ci): deduplicate docker shell helpers

skulidropek · skulidropek · commit d889d7e557bb · 2026-04-09T20:57:38.000Z
diff --git a/packages/app/src/docker-git/cli/parser-open.ts b/packages/app/src/docker-git/cli/parser-open.ts
@@ -2,6 +2,7 @@ import { Either } from "effect"
 
 import { type OpenCommand, type ParseError } from "@lib/core/domain"
 
+import { trimToUndefined } from "../../shared/trimmed-text.js"
 import { parseRawOptions } from "./parser-options.js"
 
 type OpenParts = {
@@ -26,11 +27,6 @@ const buildOpenCommand = (parts: OpenParts): OpenCommand => ({
   ...(parts.projectDir === undefined ? {} : { projectDir: parts.projectDir })
 })
 
-const normalizeSelector = (value: string | undefined): string | undefined => {
-  const trimmed = value?.trim() ?? ""
-  return trimmed.length > 0 ? trimmed : undefined
-}
-
 // CHANGE: parse open as a distinct selector-based command
 // WHY: open must resolve existing projects by raw selector without tmux semantics
 // QUOTE(ТЗ): "open should parse to a distinct _tag: \"Open\" command"
@@ -46,12 +42,12 @@ export const parseOpen = (args: ReadonlyArray<string>): Either.Either<OpenComman
   return Either.flatMap(parseRawOptions(rest), (raw) =>
     Either.right(
       buildOpenCommand({
-        ...(normalizeSelector(raw.projectDir) === undefined
+        ...(trimToUndefined(raw.projectDir) === undefined
           ? {}
-          : { projectDir: normalizeSelector(raw.projectDir) }),
-        ...(normalizeSelector(raw.containerName ?? raw.repoUrl ?? positionalRef) === undefined
+          : { projectDir: trimToUndefined(raw.projectDir) }),
+        ...(trimToUndefined(raw.containerName ?? raw.repoUrl ?? positionalRef) === undefined
           ? {}
-          : { projectRef: normalizeSelector(raw.containerName ?? raw.repoUrl ?? positionalRef) })
+          : { projectRef: trimToUndefined(raw.containerName ?? raw.repoUrl ?? positionalRef) })
       })
     ))
 }
diff --git a/packages/app/src/lib/shell/docker-compose.ts b/packages/app/src/lib/shell/docker-compose.ts
@@ -7,6 +7,15 @@ import { runCommandCapture, runCommandWithCapturedOutput } from "./command-runne
 import { composeSpec, resolveDockerComposeEnv } from "./docker-compose-env.js"
 import { DockerCommandError } from "./errors.js"
 
+const buildComposeCommand = (
+  cwd: string,
+  args: ReadonlyArray<string>,
+  env: Record<string, string>
+) => ({
+  ...composeSpec(cwd, args),
+  ...(Object.keys(env).length > 0 ? { env } : {})
+})
+
 const runCompose = (
   cwd: string,
   args: ReadonlyArray<string>,
@@ -16,10 +25,7 @@ const runCompose = (
     const env = yield* _(resolveDockerComposeEnv(cwd))
     yield* _(
       runCommandWithCapturedOutput(
-        {
-          ...composeSpec(cwd, args),
-          ...(Object.keys(env).length > 0 ? { env } : {})
-        },
+        buildComposeCommand(cwd, args, env),
         okExitCodes,
         (exitCode, output) => new DockerCommandError({ exitCode, ...(output.length > 0 ? { details: output } : {}) })
       )
@@ -35,10 +41,7 @@ const runComposeCapture = (
     const env = yield* _(resolveDockerComposeEnv(cwd))
     return yield* _(
       runCommandCapture(
-        {
-          ...composeSpec(cwd, args),
-          ...(Object.keys(env).length > 0 ? { env } : {})
-        },
+        buildComposeCommand(cwd, args, env),
         okExitCodes,
         (exitCode) => new DockerCommandError({ exitCode })
       )
diff --git a/packages/app/src/lib/shell/docker-network.ts b/packages/app/src/lib/shell/docker-network.ts
@@ -6,19 +6,39 @@ import { Effect } from "effect"
 import { runCommandCapture, runCommandExitCode, runCommandWithExitCodes } from "./command-runner.js"
 import { DockerCommandError } from "./errors.js"
 
-export const runDockerNetworkConnectBridge = (
+const runDockerNetworkCommand = (
   cwd: string,
-  containerName: string
+  args: ReadonlyArray<string>
 ): Effect.Effect<void, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
+  runCommandWithExitCodes(
+    {
+      cwd,
+      command: "docker",
+      args
+    },
+    [Number(ExitCode(0))],
+    (exitCode) => new DockerCommandError({ exitCode })
+  )
+
+const runDockerNetworkCapture = (
+  cwd: string,
+  args: ReadonlyArray<string>
+): Effect.Effect<string, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
   runCommandCapture(
     {
       cwd,
       command: "docker",
-      args: ["network", "connect", "bridge", containerName]
+      args
     },
     [Number(ExitCode(0))],
     (exitCode) => new DockerCommandError({ exitCode })
-  ).pipe(Effect.asVoid)
+  )
+
+export const runDockerNetworkConnectBridge = (
+  cwd: string,
+  containerName: string
+): Effect.Effect<void, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
+  runDockerNetworkCapture(cwd, ["network", "connect", "bridge", containerName]).pipe(Effect.asVoid)
 
 export const runDockerNetworkExists = (
   cwd: string,
@@ -34,44 +54,20 @@ export const runDockerNetworkCreateBridge = (
   cwd: string,
   networkName: string
 ): Effect.Effect<void, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
-  runCommandWithExitCodes(
-    {
-      cwd,
-      command: "docker",
-      args: ["network", "create", "--driver", "bridge", networkName]
-    },
-    [Number(ExitCode(0))],
-    (exitCode) => new DockerCommandError({ exitCode })
-  )
+  runDockerNetworkCommand(cwd, ["network", "create", "--driver", "bridge", networkName])
 
 export const runDockerNetworkCreateBridgeWithSubnet = (
   cwd: string,
   networkName: string,
   subnet: string
 ): Effect.Effect<void, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
-  runCommandWithExitCodes(
-    {
-      cwd,
-      command: "docker",
-      args: ["network", "create", "--driver", "bridge", "--subnet", subnet, networkName]
-    },
-    [Number(ExitCode(0))],
-    (exitCode) => new DockerCommandError({ exitCode })
-  )
+  runDockerNetworkCommand(cwd, ["network", "create", "--driver", "bridge", "--subnet", subnet, networkName])
 
 export const runDockerNetworkContainerCount = (
   cwd: string,
   networkName: string
 ): Effect.Effect<number, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
-  runCommandCapture(
-    {
-      cwd,
-      command: "docker",
-      args: ["network", "inspect", "-f", "{{len .Containers}}", networkName]
-    },
-    [Number(ExitCode(0))],
-    (exitCode) => new DockerCommandError({ exitCode })
-  ).pipe(
+  runDockerNetworkCapture(cwd, ["network", "inspect", "-f", "{{len .Containers}}", networkName]).pipe(
     Effect.map((output) => {
       const parsed = Number.parseInt(output.trim(), 10)
       return Number.isNaN(parsed) ? 0 : parsed
@@ -82,12 +78,4 @@ export const runDockerNetworkRemove = (
   cwd: string,
   networkName: string
 ): Effect.Effect<void, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
-  runCommandWithExitCodes(
-    {
-      cwd,
-      command: "docker",
-      args: ["network", "rm", networkName]
-    },
-    [Number(ExitCode(0))],
-    (exitCode) => new DockerCommandError({ exitCode })
-  )
+  runDockerNetworkCommand(cwd, ["network", "rm", networkName])
diff --git a/packages/app/src/lib/shell/docker-runtime.ts b/packages/app/src/lib/shell/docker-runtime.ts
@@ -4,6 +4,7 @@ import type * as CommandExecutor from "@effect/platform/CommandExecutor"
 import type { PlatformError } from "@effect/platform/Error"
 import { Effect, pipe } from "effect"
 
+import { trimToUndefined } from "../../shared/trimmed-text.js"
 import { runCommandCapture } from "./command-runner.js"
 import { parseInspectNetworkEntry } from "./docker-inspect-parse.js"
 import { CommandFailedError, DockerCommandError } from "./errors.js"
@@ -16,10 +17,20 @@ export type DockerContainerRuntimeInfo = {
   readonly composeService?: string | undefined
 }
 
-const parseOptionalInspectField = (value: string | undefined): string | undefined => {
-  const trimmed = value?.trim() ?? ""
-  return trimmed.length > 0 ? trimmed : undefined
-}
+const runDockerInspectValue = (
+  cwd: string,
+  containerName: string,
+  format: string
+): Effect.Effect<string, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
+  runCommandCapture(
+    {
+      cwd,
+      command: "docker",
+      args: ["inspect", "-f", format, containerName]
+    },
+    [Number(ExitCode(0))],
+    (exitCode) => new DockerCommandError({ exitCode })
+  )
 
 export const runDockerExecExitCode = (
   cwd: string,
@@ -42,19 +53,10 @@ export const runDockerInspectContainerIp = (
   containerName: string
 ): Effect.Effect<string, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
   pipe(
-    runCommandCapture(
-      {
-        cwd,
-        command: "docker",
-        args: [
-          "inspect",
-          "-f",
-          String.raw`{{range $k,$v := .NetworkSettings.Networks}}{{printf "%s=%s\n" $k $v.IPAddress}}{{end}}`,
-          containerName
-        ]
-      },
-      [Number(ExitCode(0))],
-      (exitCode) => new DockerCommandError({ exitCode })
+    runDockerInspectValue(
+      cwd,
+      containerName,
+      String.raw`{{range $k,$v := .NetworkSettings.Networks}}{{printf "%s=%s\n" $k $v.IPAddress}}{{end}}`
     ),
     Effect.map((output) => {
       const lines = output
@@ -78,19 +80,10 @@ export const runDockerInspectContainerRuntimeInfo = (
   containerName: string
 ): Effect.Effect<DockerContainerRuntimeInfo | null, PlatformError, CommandExecutor.CommandExecutor> =>
   pipe(
-    runCommandCapture(
-      {
-        cwd,
-        command: "docker",
-        args: [
-          "inspect",
-          "-f",
-          `{{.State.Status}}\t{{with index .Config.Labels "com.docker.compose.project.working_dir"}}{{.}}{{end}}\t{{with index .Config.Labels "com.docker.compose.service"}}{{.}}{{end}}`,
-          containerName
-        ]
-      },
-      [Number(ExitCode(0))],
-      (exitCode) => new DockerCommandError({ exitCode })
+    runDockerInspectValue(
+      cwd,
+      containerName,
+      `{{.State.Status}}\t{{with index .Config.Labels "com.docker.compose.project.working_dir"}}{{.}}{{end}}\t{{with index .Config.Labels "com.docker.compose.service"}}{{.}}{{end}}`
     ),
     Effect.flatMap((output) => {
       const [status, projectWorkingDir, composeService] = output.trim().replaceAll(String.raw`\t`, "\t").split("\t")
@@ -103,8 +96,8 @@ export const runDockerInspectContainerRuntimeInfo = (
           containerName,
           running: true,
           ipAddress,
-          projectWorkingDir: parseOptionalInspectField(projectWorkingDir),
-          composeService: parseOptionalInspectField(composeService)
+          projectWorkingDir: trimToUndefined(projectWorkingDir),
+          composeService: trimToUndefined(composeService)
         }))
       )
     }),
@@ -116,19 +109,10 @@ export const runDockerInspectContainerBridgeIp = (
   containerName: string
 ): Effect.Effect<string, DockerCommandError | PlatformError, CommandExecutor.CommandExecutor> =>
   pipe(
-    runCommandCapture(
-      {
-        cwd,
-        command: "docker",
-        args: [
-          "inspect",
-          "-f",
-          "{{with (index .NetworkSettings.Networks \"bridge\")}}{{.IPAddress}}{{end}}",
-          containerName
-        ]
-      },
-      [Number(ExitCode(0))],
-      (exitCode) => new DockerCommandError({ exitCode })
+    runDockerInspectValue(
+      cwd,
+      containerName,
+      "{{with (index .NetworkSettings.Networks \"bridge\")}}{{.IPAddress}}{{end}}"
     ),
     Effect.map((output) => output.trim())
   )
diff --git a/packages/app/src/shared/trimmed-text.ts b/packages/app/src/shared/trimmed-text.ts
@@ -0,0 +1,4 @@
+export const trimToUndefined = (value: string | undefined): string | undefined => {
+  const trimmed = value?.trim() ?? ""
+  return trimmed.length > 0 ? trimmed : undefined
+}
