@better-update/cli 0.3.0 → 0.4.0

package/src/lib/android-signing-gradle.test.ts

@@ -1,95 +0,0 @@
-import { renderSigningGradle } from "./android-signing-gradle";
-
-describe(renderSigningGradle, () => {
-  it("renders standard release signing config", () => {
-    const script = renderSigningGradle({
-      keystorePath: "/tmp/release.keystore",
-      storePassword: "store-pass",
-      keyAlias: "my-key",
-      keyPassword: "key-pass",
-    });
-    expect(script).toMatchInlineSnapshot(`
-      "allprojects {
-        afterEvaluate { project ->
-          if (project.plugins.hasPlugin('com.android.application')) {
-            project.android {
-              signingConfigs {
-                release {
-                  storeFile file('/tmp/release.keystore')
-                  storePassword 'store-pass'
-                  keyAlias 'my-key'
-                  keyPassword 'key-pass'
-                }
-              }
-              buildTypes {
-                release {
-                  signingConfig signingConfigs.release
-                }
-              }
-            }
-          }
-        }
-      }
-      "
-    `);
-  });
-
-  it("references com.android.application plugin check + afterEvaluate", () => {
-    const script = renderSigningGradle({
-      keystorePath: "/k",
-      storePassword: "s",
-      keyAlias: "a",
-      keyPassword: "k",
-    });
-    expect(script).toContain("allprojects {");
-    expect(script).toContain("afterEvaluate { project ->");
-    expect(script).toContain("project.plugins.hasPlugin('com.android.application')");
-    expect(script).toContain("signingConfigs {");
-    expect(script).toContain("buildTypes {");
-    expect(script).toContain("signingConfig signingConfigs.release");
-  });
-
-  it("escapes single quotes in passwords", () => {
-    const script = renderSigningGradle({
-      keystorePath: "/k",
-      storePassword: "can't",
-      keyAlias: "won't",
-      keyPassword: "pass'word",
-    });
-    expect(script).toContain(String.raw`storePassword 'can\'t'`);
-    expect(script).toContain(String.raw`keyAlias 'won\'t'`);
-    expect(script).toContain(String.raw`keyPassword 'pass\'word'`);
-  });
-
-  it("escapes backslashes in path", () => {
-    const script = renderSigningGradle({
-      keystorePath: "C:\\keys\\release.keystore",
-      storePassword: "s",
-      keyAlias: "a",
-      keyPassword: "k",
-    });
-    expect(script).toContain(String.raw`storeFile file('C:\\keys\\release.keystore')`);
-  });
-
-  it("escapes combined backslash and quote", () => {
-    const script = renderSigningGradle({
-      keystorePath: "/k",
-      storePassword: "a\\'b",
-      keyAlias: "x",
-      keyPassword: "y",
-    });
-    // \\ → \\\\ and ' → \\'
-    expect(script).toContain(String.raw`storePassword 'a\\\'b'`);
-  });
-
-  it("escapes `$` in passwords to prevent Groovy interpolation", () => {
-    const script = renderSigningGradle({
-      keystorePath: "/k",
-      storePassword: "p@ss$word",
-      keyAlias: "a",
-      keyPassword: "$secret",
-    });
-    expect(script).toContain(String.raw`storePassword 'p@ss\$word'`);
-    expect(script).toContain(String.raw`keyPassword '\$secret'`);
-  });
-});

package/src/lib/android-signing-gradle.ts

@@ -1,52 +0,0 @@
-export interface RenderSigningGradleInput {
-  readonly keystorePath: string;
-  readonly storePassword: string;
-  readonly keyAlias: string;
-  readonly keyPassword: string;
-}
-
-/**
- * Escape a Groovy single-quoted string literal: backslashes, single quotes,
- * and `$` (to prevent string interpolation on Groovy double-quoted strings,
- * though we use single quotes everywhere for safety).
- */
-const escapeGroovySingleQuoted = (value: string): string =>
-  value
-    .replaceAll("\\", String.raw`\\`)
-    .replaceAll("'", String.raw`\'`)
-    .replaceAll("$", String.raw`\$`);
-
-/**
- * Render a Gradle init script that injects a `release` signing config into
- * every Android application module after evaluation. This is passed to
- * `./gradlew --init-script <path>` so the keystore never has to live in the
- * project tree.
- */
-export const renderSigningGradle = ({
-  keystorePath,
-  storePassword,
-  keyAlias,
-  keyPassword,
-}: RenderSigningGradleInput): string =>
-  `allprojects {
-  afterEvaluate { project ->
-    if (project.plugins.hasPlugin('com.android.application')) {
-      project.android {
-        signingConfigs {
-          release {
-            storeFile file('${escapeGroovySingleQuoted(keystorePath)}')
-            storePassword '${escapeGroovySingleQuoted(storePassword)}'
-            keyAlias '${escapeGroovySingleQuoted(keyAlias)}'
-            keyPassword '${escapeGroovySingleQuoted(keyPassword)}'
-          }
-        }
-        buildTypes {
-          release {
-            signingConfig signingConfigs.release
-          }
-        }
-      }
-    }
-  }
-}
-`;

package/src/lib/app-json.ts

@@ -1,81 +0,0 @@
-import { FileSystem } from "@effect/platform";
-import { Effect } from "effect";
-
-import { ProjectNotLinkedError } from "./exit-codes";
-import { formatCause } from "./format-error";
-import { asRecord, isRecord } from "./record";
-
-export const readAppJson = Effect.gen(function* () {
-  const fs = yield* FileSystem.FileSystem;
-  const content = yield* fs
-    .readFileString("./app.json")
-    .pipe(
-      Effect.mapError(
-        () => new ProjectNotLinkedError({ message: "app.json not found in current directory" }),
-      ),
-    );
-  const parsed = yield* Effect.try({
-    try: (): unknown => JSON.parse(content),
-    catch: () => new ProjectNotLinkedError({ message: "app.json contains malformed JSON" }),
-  });
-  if (!isRecord(parsed)) {
-    return yield* new ProjectNotLinkedError({ message: "app.json must be a JSON object" });
-  }
-  return parsed;
-});
-
-export const readProjectId = Effect.gen(function* () {
-  const appJson = yield* readAppJson;
-  const expo = asRecord(appJson["expo"]);
-  const extra = asRecord(expo?.["extra"]);
-  const betterUpdate = asRecord(extra?.["betterUpdate"]);
-  const projectId = betterUpdate?.["projectId"];
-
-  if (typeof projectId !== "string") {
-    return yield* new ProjectNotLinkedError({
-      message:
-        "Project not linked. Run `better-update link` to connect this project, or set expo.extra.betterUpdate.projectId in app.json.",
-    });
-  }
-
-  return projectId;
-});
-
-export const readSlug = Effect.gen(function* () {
-  const appJson = yield* readAppJson;
-  const expo = asRecord(appJson["expo"]);
-  const slug = expo?.["slug"];
-
-  if (typeof slug !== "string") {
-    return yield* new ProjectNotLinkedError({
-      message: "Missing expo.slug in app.json. Required to identify the project.",
-    });
-  }
-
-  return slug;
-});
-
-export const writeProjectId = (id: string) =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const appJson = yield* readAppJson;
-
-    const expo = asRecord(appJson["expo"]) ?? {};
-    const extra = asRecord(expo["extra"]) ?? {};
-    const betterUpdate = asRecord(extra["betterUpdate"]) ?? {};
-
-    betterUpdate["projectId"] = id;
-    extra["betterUpdate"] = betterUpdate;
-    expo["extra"] = extra;
-    appJson["expo"] = expo;
-
-    yield* fs.writeFileString("./app.json", `${JSON.stringify(appJson, null, 2)}\n`);
-  }).pipe(
-    Effect.mapError((cause) =>
-      cause instanceof ProjectNotLinkedError
-        ? cause
-        : new ProjectNotLinkedError({
-            message: `Failed to write project ID to app.json: ${formatCause(cause)}`,
-          }),
-    ),
-  );

package/src/lib/apple-auth.test.ts

@@ -1,402 +0,0 @@
-import { Terminal } from "@effect/platform";
-import { it } from "@effect/vitest";
-import { Effect, Exit, Layer, Mailbox, Option } from "effect";
-
-import type { Session } from "@expo/apple-utils";
-// eslint-disable-next-line import-plugin/no-namespace -- stub factory typed as `typeof AppleUtils` (whole module shape); no named type covers the full module
-import type * as AppleUtils from "@expo/apple-utils";
-
-import { CliRuntime } from "../services/cli-runtime";
-import { parseProviderId, resolveProvider } from "./apple-auth";
-import { AppleAuthError } from "./exit-codes";
-
-// ── helpers ──────────────────────────────────────────────────────
-
-const provider = (
-  providerId: number,
-  name = `Provider ${providerId}`,
-  subType = "ORGANIZATION",
-): Session.SessionProvider => ({
-  providerId,
-  publicProviderId: `pub-${providerId}`,
-  name,
-  contentTypes: ["SOFTWARE"],
-  subType,
-});
-
-const makeAppleUtilsStub = (setProviderSpy?: (id: number) => Promise<unknown>) =>
-  ({
-    Session: {
-      setSessionProviderIdAsync: async (id: number) =>
-        setProviderSpy?.(id) ?? Promise.resolve(null),
-    },
-  }) as unknown as typeof AppleUtils;
-
-const makeCliRuntimeLayer = (env: Readonly<Record<string, string | undefined>> = {}) =>
-  Layer.succeed(CliRuntime, {
-    argv: [],
-    platform: "linux" as NodeJS.Platform,
-    cwd: Effect.succeed("/"),
-    getEnv: (name: string) => Effect.succeed(env[name]),
-    homeDirectory: Effect.succeed("/"),
-    userName: Effect.succeed("test"),
-    commandEnvironment: () => Effect.succeed({}),
-    setExitCode: () => Effect.void,
-  });
-
-// Stub Terminal — none of the non-prompt branches read from it.
-const terminalStubLayer = Layer.succeed(Terminal.Terminal, {
-  columns: Effect.succeed(80),
-  rows: Effect.succeed(24),
-  isTTY: Effect.succeed(false),
-  readInput: Effect.dieMessage("readInput not used in tests") as never,
-  readLine: Effect.dieMessage("readLine not used in tests") as never,
-  display: () => Effect.void,
-});
-
-const provideTestServices = (env: Readonly<Record<string, string | undefined>> = {}) =>
-  Layer.mergeAll(makeCliRuntimeLayer(env), terminalStubLayer);
-
-// ── parseProviderId ──────────────────────────────────────────────
-
-describe(parseProviderId, () => {
-  it.effect("accepts a positive integer string", () =>
-    Effect.gen(function* () {
-      const result = yield* parseProviderId("118573544");
-      expect(result).toBe(118_573_544);
-    }),
-  );
-
-  it.effect("accepts zero", () =>
-    Effect.gen(function* () {
-      const result = yield* parseProviderId("0");
-      expect(result).toBe(0);
-    }),
-  );
-
-  it.effect("rejects a non-numeric string with AppleAuthError", () =>
-    Effect.gen(function* () {
-      const exit = yield* Effect.exit(parseProviderId("abc"));
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const err = exit.cause._tag === "Fail" ? exit.cause.error : null;
-        expect(err).toBeInstanceOf(AppleAuthError);
-        expect(err!.message).toContain("APPLE_PROVIDER_ID");
-      }
-    }),
-  );
-
-  it.effect("rejects a decimal value", () =>
-    Effect.gen(function* () {
-      const exit = yield* Effect.exit(parseProviderId("1.5"));
-      expect(Exit.isFailure(exit)).toBe(true);
-    }),
-  );
-
-  it.effect("rejects an empty string", () =>
-    Effect.gen(function* () {
-      // Number("") === 0, which IS an integer — guard at call site (readEnvProviderId)
-      // Skips empty strings. Document that parseProviderId treats "" as 0.
-      const result = yield* parseProviderId("");
-      expect(result).toBe(0);
-    }),
-  );
-});
-
-// ── resolveProvider ──────────────────────────────────────────────
-
-describe(resolveProvider, () => {
-  it.effect("uses APPLE_PROVIDER_ID env when set, switching when it differs from current", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(appleUtils, [provider(1), provider(2)], 1, undefined);
-
-      expect(result).toStrictEqual({ providerId: 2, switched: true });
-      expect(calls).toStrictEqual([2]);
-    }).pipe(Effect.provide(provideTestServices({ APPLE_PROVIDER_ID: "2" }))),
-  );
-
-  it.effect("env match against current provider does not trigger switch", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(appleUtils, [provider(1), provider(2)], 1, undefined);
-
-      expect(result).toStrictEqual({ providerId: 1, switched: false });
-      expect(calls).toStrictEqual([]);
-    }).pipe(Effect.provide(provideTestServices({ APPLE_PROVIDER_ID: "1" }))),
-  );
-
-  it.effect("invalid env value fails with AppleAuthError", () =>
-    Effect.gen(function* () {
-      const appleUtils = makeAppleUtilsStub();
-      const exit = yield* Effect.exit(resolveProvider(appleUtils, [provider(1)], 1, undefined));
-      expect(Exit.isFailure(exit)).toBe(true);
-    }).pipe(Effect.provide(provideTestServices({ APPLE_PROVIDER_ID: "not-a-number" }))),
-  );
-
-  it.effect("uses cached provider when still available", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(
-        appleUtils,
-        [provider(1), provider(2), provider(3)],
-        1,
-        3,
-      );
-
-      expect(result).toStrictEqual({ providerId: 3, switched: true });
-      expect(calls).toStrictEqual([3]);
-    }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect("ignores stale cached provider and falls through to single available", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      // Cached provider 99 no longer in availableProviders → fall through.
-      const result = yield* resolveProvider(appleUtils, [provider(7)], 7, 99);
-
-      expect(result).toStrictEqual({ providerId: 7, switched: false });
-      expect(calls).toStrictEqual([]);
-    }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect("returns currentProviderId when availableProviders is empty", () =>
-    Effect.gen(function* () {
-      const appleUtils = makeAppleUtilsStub();
-
-      const result = yield* resolveProvider(appleUtils, [], 5, undefined);
-
-      expect(result).toStrictEqual({ providerId: 5, switched: false });
-    }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect("returns undefined when no providers and no current id", () =>
-    Effect.gen(function* () {
-      const appleUtils = makeAppleUtilsStub();
-
-      const result = yield* resolveProvider(appleUtils, [], undefined, undefined);
-
-      expect(result).toStrictEqual({ providerId: undefined, switched: false });
-    }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect("single available provider applies through applyChoice", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(appleUtils, [provider(42)], undefined, undefined);
-
-      expect(result).toStrictEqual({ providerId: 42, switched: true });
-      expect(calls).toStrictEqual([42]);
-    }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect(
-    "multi-provider with no env, no cache, autoresolved current → preserves without prompt",
-    () =>
-      Effect.gen(function* () {
-        const calls: number[] = [];
-        const appleUtils = makeAppleUtilsStub(async (id) => {
-          calls.push(id);
-          return null;
-        });
-
-        // CurrentProviderId is set (apple-utils auto-resolved). No prompt — CI-safe.
-        const result = yield* resolveProvider(
-          appleUtils,
-          [provider(1), provider(2), provider(3)],
-          2,
-          undefined,
-        );
-
-        expect(result).toStrictEqual({ providerId: 2, switched: false });
-        expect(calls).toStrictEqual([]);
-      }).pipe(Effect.provide(provideTestServices())),
-  );
-
-  it.effect("env value takes precedence over cached pick", () =>
-    Effect.gen(function* () {
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(
-        appleUtils,
-        [provider(1), provider(2), provider(3)],
-        1,
-        3,
-      );
-
-      expect(result).toStrictEqual({ providerId: 2, switched: true });
-      expect(calls).toStrictEqual([2]);
-    }).pipe(Effect.provide(provideTestServices({ APPLE_PROVIDER_ID: "2" }))),
-  );
-
-  it.effect("propagates AppleAuthError when setSessionProviderIdAsync rejects", () =>
-    Effect.gen(function* () {
-      const appleUtils = makeAppleUtilsStub(async () => {
-        throw new Error("provider not accessible");
-      });
-
-      const exit = yield* Effect.exit(
-        resolveProvider(appleUtils, [provider(1), provider(2)], 1, undefined),
-      );
-
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const err = exit.cause._tag === "Fail" ? exit.cause.error : null;
-        expect(err).toBeInstanceOf(AppleAuthError);
-        expect((err as AppleAuthError).message).toContain("Failed to switch");
-      }
-    }).pipe(Effect.provide(provideTestServices({ APPLE_PROVIDER_ID: "2" }))),
-  );
-});
-
-// ── resolveProvider (prompt branch via scripted Terminal) ────────
-
-interface KeyEvent {
-  readonly name: string;
-  readonly input?: string;
-  readonly ctrl?: boolean;
-  readonly meta?: boolean;
-  readonly shift?: boolean;
-}
-
-const toUserInput = (event: KeyEvent): Terminal.UserInput => ({
-  input: event.input ? Option.some(event.input) : Option.none(),
-  key: {
-    name: event.name,
-    ctrl: event.ctrl ?? false,
-    meta: event.meta ?? false,
-    shift: event.shift ?? false,
-  },
-});
-
-/**
- * Build a Terminal layer backed by a pre-filled Mailbox of scripted keystrokes.
- * `display` output is captured into `displayed` for optional assertions.
- */
-const makeScriptedTerminalLayer = (events: readonly KeyEvent[], displayed: string[]) =>
-  Layer.effect(
-    Terminal.Terminal,
-    Effect.gen(function* () {
-      const mailbox = yield* Mailbox.make<Terminal.UserInput>();
-      yield* mailbox.offerAll(events.map(toUserInput));
-      return {
-        columns: Effect.succeed(80),
-        rows: Effect.succeed(24),
-        isTTY: Effect.succeed(true),
-        readInput: Effect.succeed(mailbox),
-        readLine: Effect.dieMessage("readLine not used in prompt tests") as never,
-        display: (text: string) =>
-          Effect.sync(() => {
-            displayed.push(text);
-          }),
-      };
-    }),
-  );
-
-const provideScriptedPrompt = (
-  events: readonly KeyEvent[],
-  displayed: string[],
-  env: Readonly<Record<string, string | undefined>> = {},
-) => Layer.mergeAll(makeCliRuntimeLayer(env), makeScriptedTerminalLayer(events, displayed));
-
-describe("resolveProvider (prompt branch)", () => {
-  it.effect("prompts when multi-provider + no env + no cache + no auto-current", () =>
-    Effect.gen(function* () {
-      const displayed: string[] = [];
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(
-        appleUtils,
-        [provider(10, "Org A"), provider(20, "Org B"), provider(30, "Org C")],
-        undefined,
-        undefined,
-      ).pipe(
-        Effect.provide(
-          provideScriptedPrompt(
-            [{ name: "down" }, { name: "down" }, { name: "return" }],
-            displayed,
-          ),
-        ),
-      );
-
-      expect(result).toStrictEqual({ providerId: 30, switched: true });
-      expect(calls).toStrictEqual([30]);
-      const allDisplay = displayed.join("");
-      expect(allDisplay).toContain("Select App Store Connect provider");
-      expect(allDisplay).toContain("Org C");
-    }),
-  );
-
-  it.effect("enter on first item picks it without arrow keys", () =>
-    Effect.gen(function* () {
-      const displayed: string[] = [];
-      const calls: number[] = [];
-      const appleUtils = makeAppleUtilsStub(async (id) => {
-        calls.push(id);
-        return null;
-      });
-
-      const result = yield* resolveProvider(
-        appleUtils,
-        [provider(1), provider(2)],
-        undefined,
-        undefined,
-      ).pipe(Effect.provide(provideScriptedPrompt([{ name: "return" }], displayed)));
-
-      expect(result).toStrictEqual({ providerId: 1, switched: true });
-      expect(calls).toStrictEqual([1]);
-    }),
-  );
-
-  it.effect("up-arrow wraps around from top to bottom", () =>
-    Effect.gen(function* () {
-      const displayed: string[] = [];
-      const appleUtils = makeAppleUtilsStub(async () => null);
-
-      const result = yield* resolveProvider(
-        appleUtils,
-        [provider(1), provider(2), provider(3)],
-        undefined,
-        undefined,
-      ).pipe(
-        Effect.provide(provideScriptedPrompt([{ name: "up" }, { name: "return" }], displayed)),
-      );
-
-      expect(result.providerId).toBe(3);
-      expect(result.switched).toBe(true);
-    }),
-  );
-});