@better-update/cli 0.3.0 → 0.4.0

package/src/lib/apple-auth.ts

@@ -1,132 +0,0 @@
-import { Prompt } from "@effect/cli";
-import { Effect } from "effect";
-
-import type { QuitException, Terminal } from "@effect/platform/Terminal";
-import type { Session } from "@expo/apple-utils";
-// eslint-disable-next-line import-plugin/no-namespace -- the `appleUtils` injected dependency is typed as `typeof AppleUtils` (the whole module shape); no equivalent named type exists
-import type * as AppleUtils from "@expo/apple-utils";
-
-import { CliRuntime } from "../services/cli-runtime";
-import { AppleAuthError } from "./exit-codes";
-
-type SessionProvider = Session.SessionProvider;
-
-interface ProviderResolution {
-  readonly providerId: number | undefined;
-  readonly switched: boolean;
-}
-
-const APPLE_PROVIDER_ID_ENV = "APPLE_PROVIDER_ID";
-
-const readEnv = (name: string) =>
-  Effect.gen(function* () {
-    const runtime = yield* CliRuntime;
-    return yield* runtime.getEnv(name);
-  });
-
-export const parseProviderId = (raw: string): Effect.Effect<number, AppleAuthError> => {
-  const id = Number(raw);
-  return Number.isInteger(id)
-    ? Effect.succeed(id)
-    : Effect.fail(
-        new AppleAuthError({
-          message: `${APPLE_PROVIDER_ID_ENV} must be a numeric provider ID, got "${raw}".`,
-        }),
-      );
-};
-
-const readEnvProviderId: Effect.Effect<number | undefined, AppleAuthError, CliRuntime> = Effect.gen(
-  function* () {
-    const raw = yield* readEnv(APPLE_PROVIDER_ID_ENV);
-    if (!raw) {
-      return undefined;
-    }
-    return yield* parseProviderId(raw);
-  },
-);
-
-const switchSessionProvider = (
-  appleUtils: typeof AppleUtils,
-  providerId: number,
-): Effect.Effect<void, AppleAuthError> =>
-  Effect.tryPromise({
-    try: async () => appleUtils.Session.setSessionProviderIdAsync(providerId),
-    catch: (error) =>
-      new AppleAuthError({
-        message: `Failed to switch App Store Connect provider (${providerId}): ${String(error)}`,
-      }),
-  }).pipe(Effect.asVoid);
-
-const isProviderAvailable = (providers: readonly SessionProvider[], providerId: number): boolean =>
-  providers.some((provider) => provider.providerId === providerId);
-
-/**
- * Resolve App Store Connect provider for an interactive session.
- *
- * Selection order: APPLE_PROVIDER_ID env → valid cached pick → single available
- * → preserve apple-utils' auto-resolved provider → prompt.
- *
- * `switched` flags that the apple-utils cookie jar was mutated; previously-captured
- * cookies are stale and callers should re-extract.
- *
- * Headless-safe: prompt only fires when no env, no valid cache, multiple providers,
- * AND apple-utils returned no auto-resolved provider.
- */
-export const resolveProvider = (
-  appleUtils: typeof AppleUtils,
-  availableProviders: readonly SessionProvider[],
-  currentProviderId: number | undefined,
-  cachedProviderId: number | undefined,
-): Effect.Effect<ProviderResolution, AppleAuthError | QuitException, CliRuntime | Terminal> =>
-  Effect.gen(function* () {
-    let switched = false;
-
-    const applyChoice = (picked: number) =>
-      Effect.gen(function* () {
-        if (currentProviderId !== picked) {
-          yield* switchSessionProvider(appleUtils, picked);
-          switched = true;
-        }
-        return picked;
-      });
-
-    const envId = yield* readEnvProviderId;
-    if (envId !== undefined) {
-      const id = yield* applyChoice(envId);
-      return { providerId: id, switched };
-    }
-
-    if (
-      cachedProviderId !== undefined &&
-      isProviderAvailable(availableProviders, cachedProviderId)
-    ) {
-      const id = yield* applyChoice(cachedProviderId);
-      return { providerId: id, switched };
-    }
-
-    if (availableProviders.length === 0) {
-      return { providerId: currentProviderId, switched };
-    }
-    const [firstProvider] = availableProviders;
-    if (availableProviders.length === 1 && firstProvider) {
-      const id = yield* applyChoice(firstProvider.providerId);
-      return { providerId: id, switched };
-    }
-
-    // Multi-provider, no explicit signal: respect apple-utils auto-resolution
-    // (CI-safe). Only fall through to prompt when apple-utils returned nothing.
-    if (currentProviderId !== undefined) {
-      return { providerId: currentProviderId, switched };
-    }
-
-    const picked = yield* Prompt.select({
-      message: "Select App Store Connect provider:",
-      choices: availableProviders.map((provider) => ({
-        title: `${provider.name} [${provider.subType}] (${provider.providerId})`,
-        value: provider.providerId,
-      })),
-    });
-
-    const id = yield* applyChoice(picked);
-    return { providerId: id, switched };
-  });

package/src/lib/artifact-finder.test.ts

@@ -1,195 +0,0 @@
-import { FileSystem } from "@effect/platform";
-import { it } from "@effect/vitest";
-import { Effect, Exit, Option } from "effect";
-
-import { findAndroidArtifact, findIosArtifact } from "./artifact-finder";
-import { ArtifactNotFoundError } from "./exit-codes";
-import { failureError } from "./test-utils";
-
-// ── fake FS ───────────────────────────────────────────────────────
-
-interface FakeFile {
-  readonly type: "File";
-  readonly mtimeMs: number;
-}
-interface FakeDir {
-  readonly type: "Directory";
-}
-type FakeEntry = FakeFile | FakeDir;
-
-const mkInfo = (entry: FakeEntry) =>
-  ({
-    type: entry.type,
-    mtime: entry.type === "File" ? Option.some(new Date(entry.mtimeMs)) : Option.none<Date>(),
-    atime: Option.none<Date>(),
-    birthtime: Option.none<Date>(),
-    dev: 0,
-    ino: Option.none<number>(),
-    mode: 0o644,
-    nlink: Option.none<number>(),
-    uid: Option.none<number>(),
-    gid: Option.none<number>(),
-    rdev: Option.none<number>(),
-    size: 0n,
-    blksize: Option.none<bigint>(),
-    blocks: Option.none<number>(),
-  }) as unknown as FileSystem.File.Info;
-
-const makeFakeFs = (entries: Record<string, FakeEntry>) => {
-  const paths = new Set(Object.keys(entries));
-  return FileSystem.layerNoop({
-    exists: (targetPath: string) => Effect.succeed(paths.has(targetPath)),
-    readDirectory: (targetPath: string) =>
-      Effect.sync(() => {
-        const prefix = `${targetPath}/`;
-        const children = new Set<string>();
-        for (const full of paths) {
-          if (full.startsWith(prefix)) {
-            const rest = full.slice(prefix.length);
-            const [head] = rest.split("/");
-            if (head) {
-              children.add(head);
-            }
-          }
-        }
-        return [...children];
-      }),
-    stat: (targetPath: string) => {
-      const entry = entries[targetPath];
-      if (!entry) {
-        return Effect.die(new Error(`ENOENT: ${targetPath}`));
-      }
-      return Effect.succeed(mkInfo(entry));
-    },
-  });
-};
-
-// ── iOS tests ─────────────────────────────────────────────────────
-
-describe(findIosArtifact, () => {
-  it.effect("returns the newest .ipa under exportPath", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/export": { type: "Directory" },
-        "/export/OldBuild.ipa": { type: "File", mtimeMs: 1000 },
-        "/export/NewBuild.ipa": { type: "File", mtimeMs: 5000 },
-        "/export/notes.txt": { type: "File", mtimeMs: 6000 },
-      });
-      const result = yield* findIosArtifact({ exportPath: "/export" }).pipe(Effect.provide(fs));
-      expect(result).toBe("/export/NewBuild.ipa");
-    }),
-  );
-
-  it.effect("fails when no .ipa found", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/export": { type: "Directory" },
-        "/export/readme.md": { type: "File", mtimeMs: 1 },
-      });
-      const exit = yield* findIosArtifact({ exportPath: "/export" }).pipe(
-        Effect.provide(fs),
-        Effect.exit,
-      );
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(ArtifactNotFoundError);
-      }
-    }),
-  );
-
-  it.effect("returns nested .ipa via walk", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/export": { type: "Directory" },
-        "/export/nested": { type: "Directory" },
-        "/export/nested/inner.ipa": { type: "File", mtimeMs: 9000 },
-      });
-      const result = yield* findIosArtifact({ exportPath: "/export" }).pipe(Effect.provide(fs));
-      expect(result).toBe("/export/nested/inner.ipa");
-    }),
-  );
-});
-
-// ── Android tests ─────────────────────────────────────────────────
-
-describe(findAndroidArtifact, () => {
-  it.effect("finds .aab at expected Gradle output path (no flavor)", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/project/android/app/build/outputs": { type: "Directory" },
-        "/project/android/app/build/outputs/bundle": { type: "Directory" },
-        "/project/android/app/build/outputs/bundle/release": { type: "Directory" },
-        "/project/android/app/build/outputs/bundle/release/app.aab": {
-          type: "File",
-          mtimeMs: 1234,
-        },
-      });
-      const result = yield* findAndroidArtifact({
-        projectRoot: "/project",
-        format: "aab",
-        buildType: "release",
-      }).pipe(Effect.provide(fs));
-      expect(result).toBe("/project/android/app/build/outputs/bundle/release/app.aab");
-    }),
-  );
-
-  it.effect("finds .apk at expected Gradle output path with flavor", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/p/android/app/build/outputs": { type: "Directory" },
-        "/p/android/app/build/outputs/apk": { type: "Directory" },
-        "/p/android/app/build/outputs/apk/prodRelease": { type: "Directory" },
-        "/p/android/app/build/outputs/apk/prodRelease/app-prod-release.apk": {
-          type: "File",
-          mtimeMs: 100,
-        },
-      });
-      const result = yield* findAndroidArtifact({
-        projectRoot: "/p",
-        format: "apk",
-        flavor: "prod",
-        buildType: "release",
-      }).pipe(Effect.provide(fs));
-      expect(result).toBe("/p/android/app/build/outputs/apk/prodRelease/app-prod-release.apk");
-    }),
-  );
-
-  it.effect("falls back to walking outputs tree when expected dir missing", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/p/android/app/build/outputs": { type: "Directory" },
-        "/p/android/app/build/outputs/bundle": { type: "Directory" },
-        "/p/android/app/build/outputs/bundle/somewhere-else": { type: "Directory" },
-        "/p/android/app/build/outputs/bundle/somewhere-else/fallback.aab": {
-          type: "File",
-          mtimeMs: 500,
-        },
-      });
-      const result = yield* findAndroidArtifact({
-        projectRoot: "/p",
-        format: "aab",
-        buildType: "release",
-      }).pipe(Effect.provide(fs));
-      expect(result).toBe("/p/android/app/build/outputs/bundle/somewhere-else/fallback.aab");
-    }),
-  );
-
-  it.effect("fails with ArtifactNotFoundError when nothing matches", () =>
-    Effect.gen(function* () {
-      const fs = makeFakeFs({
-        "/p/android/app/build/outputs": { type: "Directory" },
-      });
-      const exit = yield* findAndroidArtifact({
-        projectRoot: "/p",
-        format: "aab",
-        buildType: "release",
-      }).pipe(Effect.provide(fs), Effect.exit);
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(ArtifactNotFoundError);
-      }
-    }),
-  );
-});

package/src/lib/artifact-finder.ts

@@ -1,122 +0,0 @@
-import path from "node:path";
-
-import { FileSystem } from "@effect/platform";
-import { Effect, Option } from "effect";
-import { maxBy } from "es-toolkit";
-
-import type { PlatformError } from "@effect/platform/Error";
-
-import { ArtifactNotFoundError } from "./exit-codes";
-import { capitalize } from "./string-utils";
-
-export interface FindIosArtifactOptions {
-  readonly exportPath: string;
-}
-
-export interface FindAndroidArtifactOptions {
-  readonly projectRoot: string;
-  readonly format: "apk" | "aab";
-  readonly flavor?: string;
-  readonly buildType: "debug" | "release";
-  /**
-   * If provided, only artifacts with mtimeMs >= this value are considered.
-   * Used to exclude stale artifacts from previous builds when the current
-   * build failed to write an expected output.
-   */
-  readonly minMtimeMs?: number;
-}
-
-interface FoundFile {
-  readonly path: string;
-  readonly mtimeMs: number;
-}
-
-const walkAndFind = (
-  root: string,
-  extension: string,
-): Effect.Effect<readonly FoundFile[], PlatformError, FileSystem.FileSystem> =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    // No fs.exists pre-check: readDirectory on a missing/non-dir path fails
-    // With a PlatformError that we catch into an empty list below.
-    const entries = yield* fs.readDirectory(root).pipe(Effect.orElseSucceed(() => []));
-
-    const results: FoundFile[] = [];
-    for (const entry of entries) {
-      const fullPath = path.join(root, entry);
-      const stat = yield* fs.stat(fullPath).pipe(Effect.option);
-      if (Option.isSome(stat)) {
-        const info = stat.value;
-        if (info.type === "Directory") {
-          const nested = yield* walkAndFind(fullPath, extension);
-          results.push(...nested);
-        } else if (info.type === "File" && entry.toLowerCase().endsWith(extension)) {
-          results.push({
-            path: fullPath,
-            mtimeMs: Option.match(info.mtime, {
-              onNone: () => 0,
-              onSome: (date) => date.getTime(),
-            }),
-          });
-        }
-      }
-    }
-    return results;
-  });
-
-const newest = (files: readonly FoundFile[], minMtimeMs?: number): FoundFile | undefined => {
-  const eligible =
-    minMtimeMs === undefined ? files : files.filter((file) => file.mtimeMs >= minMtimeMs);
-  return maxBy(eligible, (file) => file.mtimeMs);
-};
-
-export const findIosArtifact = ({
-  exportPath,
-}: FindIosArtifactOptions): Effect.Effect<
-  string,
-  ArtifactNotFoundError | PlatformError,
-  FileSystem.FileSystem
-> =>
-  Effect.gen(function* () {
-    const files = yield* walkAndFind(exportPath, ".ipa");
-    const picked = newest(files);
-    if (!picked) {
-      return yield* new ArtifactNotFoundError({
-        message: `No .ipa file found under "${exportPath}".`,
-      });
-    }
-    return picked.path;
-  });
-
-export const findAndroidArtifact = ({
-  projectRoot,
-  format,
-  flavor,
-  buildType,
-  minMtimeMs,
-}: FindAndroidArtifactOptions): Effect.Effect<
-  string,
-  ArtifactNotFoundError | PlatformError,
-  FileSystem.FileSystem
-> =>
-  Effect.gen(function* () {
-    const outputsRoot = path.join(projectRoot, "android", "app", "build", "outputs");
-    const subdir = format === "aab" ? "bundle" : "apk";
-    const variantDir = flavor ? `${flavor}${capitalize(buildType)}` : buildType;
-    const expectedDir = path.join(outputsRoot, subdir, variantDir);
-
-    const direct = yield* walkAndFind(expectedDir, `.${format}`);
-    const pickedDirect = newest(direct, minMtimeMs);
-    if (pickedDirect) {
-      return pickedDirect.path;
-    }
-
-    const fallback = yield* walkAndFind(outputsRoot, `.${format}`);
-    const pickedFallback = newest(fallback, minMtimeMs);
-    if (!pickedFallback) {
-      return yield* new ArtifactNotFoundError({
-        message: `No .${format} artifact found under "${outputsRoot}"${minMtimeMs === undefined ? "" : " (newer than build start)"}.`,
-      });
-    }
-    return pickedFallback.path;
-  });

package/src/lib/browser-login.test.ts

@@ -1,88 +0,0 @@
-import { Effect } from "effect";
-
-import {
-  BrowserLoginSessionClosedError,
-  BrowserLoginTimeoutError,
-  CALLBACK_PAGE,
-  createBrowserLoginSession,
-} from "./browser-login";
-
-describe(createBrowserLoginSession, () => {
-  it("serves the callback page HTML", async () => {
-    const session = createBrowserLoginSession({ timeoutMs: 1000 });
-
-    try {
-      const response = await session.handleRequest(new Request("http://127.0.0.1/callback"));
-      const html = await response.text();
-
-      expect(response.status).toBe(200);
-      expect(response.headers.get("content-type")).toContain("text/html");
-      expect(html).toContain("Completing CLI login");
-      expect(html).toContain(CALLBACK_PAGE.slice(0, 15));
-    } finally {
-      session.dispose();
-    }
-  });
-
-  it("resolves the submitted token", async () => {
-    const session = createBrowserLoginSession({ timeoutMs: 1000 });
-
-    try {
-      const response = await session.handleRequest(
-        new Request("http://127.0.0.1/callback/token", {
-          method: "POST",
-          headers: { "content-type": "application/json" },
-          body: JSON.stringify({ token: "bu_secret_123" }),
-        }),
-      );
-
-      expect(response.status).toBe(200);
-      await expect(Effect.runPromise(session.waitForToken)).resolves.toBe("bu_secret_123");
-    } finally {
-      session.dispose();
-    }
-  });
-
-  it("rejects invalid callback payloads", async () => {
-    const session = createBrowserLoginSession({ timeoutMs: 50 });
-
-    try {
-      const response = await session.handleRequest(
-        new Request("http://127.0.0.1/callback/token", {
-          method: "POST",
-          headers: { "content-type": "application/json" },
-          body: JSON.stringify({ token: "" }),
-        }),
-      );
-
-      expect(response.status).toBe(400);
-      const error = await Effect.runPromise(Effect.flip(session.waitForToken));
-      expect(error).toBeInstanceOf(BrowserLoginTimeoutError);
-      expect(error._tag).toBe("BrowserLoginTimeoutError");
-    } finally {
-      session.dispose();
-    }
-  });
-
-  it("times out when no token arrives", async () => {
-    const session = createBrowserLoginSession({ timeoutMs: 20 });
-
-    try {
-      const error = await Effect.runPromise(Effect.flip(session.waitForToken));
-      expect(error).toBeInstanceOf(BrowserLoginTimeoutError);
-      expect(error._tag).toBe("BrowserLoginTimeoutError");
-    } finally {
-      session.dispose();
-    }
-  });
-
-  it("fails with a tagged error when the session is disposed", async () => {
-    const session = createBrowserLoginSession({ timeoutMs: 1000 });
-
-    session.dispose();
-
-    const error = await Effect.runPromise(Effect.flip(session.waitForToken));
-    expect(error).toBeInstanceOf(BrowserLoginSessionClosedError);
-    expect(error._tag).toBe("BrowserLoginSessionClosedError");
-  });
-});