instant-cli 1.0.23-branch-cli-codex-update.25390498340.1 → 1.0.23-branch-codex-cli-args-combinators.25393207850.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> instant-cli@1.0.23-branch-cli-codex-update.25390498340.1 build /home/runner/work/instant/instant/client/packages/cli
+> instant-cli@1.0.23-branch-codex-cli-args-combinators.25393207850.1 build /home/runner/work/instant/instant/client/packages/cli
 > rm -rf dist; tsc -p tsconfig.build.json
 

package/__tests__/args.test.ts

@@ -0,0 +1,203 @@
+import { test, expect, describe, vi } from 'vitest';
+import { Effect, Layer } from 'effect';
+import { Args } from '../src/lib/args.ts';
+import { GlobalOpts } from '../src/context/globalOpts.ts';
+
+const run = <A>(effect: Effect.Effect<A, any, GlobalOpts>, yes: boolean) =>
+  Effect.runPromise(
+    effect.pipe(Effect.provide(Layer.succeed(GlobalOpts, { yes }))),
+  );
+
+const runFail = <A>(effect: Effect.Effect<A, any, GlobalOpts>, yes: boolean) =>
+  Effect.runPromise(
+    effect.pipe(
+      Effect.flip,
+      Effect.provide(Layer.succeed(GlobalOpts, { yes })),
+    ),
+  );
+
+let mockPromptReturn: unknown = '';
+vi.mock('../src/ui/lib.ts', async (importOriginal) => {
+  const orig: any = await importOriginal();
+  return {
+    ...orig,
+    renderUnwrap: () => Promise.resolve(mockPromptReturn),
+  };
+});
+
+const basePrompt = { prompt: 'Client ID:' } as any;
+
+describe('forbidIf', () => {
+  test('condition=true + value provided -> error', async () => {
+    const err = await runFail(
+      Args.text(
+        { 'custom-redirect-uri': 'https://mysite.com/callback' },
+        'custom-redirect-uri',
+      ).pipe(
+        Args.forbidIf(true, {
+          message: 'Provided custom redirect URI when not using web app type.',
+        }),
+      ),
+      false,
+    );
+
+    expect(err.message).toBe(
+      'Provided custom redirect URI when not using web app type.',
+    );
+  });
+
+  test('condition=true + no value -> undefined', async () => {
+    const result = await run(
+      Args.text({}, 'custom-redirect-uri').pipe(Args.forbidIf(true)),
+      false,
+    );
+
+    expect(result).toBeUndefined();
+  });
+});
+
+describe('non-interactive', () => {
+  test('required missing value -> error', async () => {
+    const err = await runFail(
+      Args.text({}, 'client-id').pipe(
+        Args.orPrompt(basePrompt),
+        Args.required(),
+      ),
+      true,
+    );
+
+    expect(err.message).toBe('Missing required value for --client-id');
+  });
+
+  test('number value -> stringified', async () => {
+    const result = await run(
+      Args.text({ 'client-id': 42 }, 'client-id').pipe(Args.required()),
+      true,
+    );
+
+    expect(result).toBe('42');
+  });
+
+  test('non-string/number value -> error', async () => {
+    const err = await runFail(
+      Args.text({ 'client-id': true }, 'client-id').pipe(Args.required()),
+      true,
+    );
+
+    expect(err.message).toBe('Invalid value for --client-id');
+  });
+
+  test('valid string -> trimmed value', async () => {
+    const result = await run(
+      Args.text(
+        { 'client-id': ' abc123.apps.googleusercontent.com ' },
+        'client-id',
+      ).pipe(Args.required()),
+      true,
+    );
+
+    expect(result).toBe('abc123.apps.googleusercontent.com');
+  });
+
+  test('optional missing value -> undefined', async () => {
+    const result = await run(Args.text({}, 'custom-redirect-uri'), true);
+
+    expect(result).toBeUndefined();
+  });
+
+  test('boolean value -> parsed', async () => {
+    const result = await run(
+      Args.bool({ 'configure-web': true }, 'configure-web'),
+      true,
+    );
+
+    expect(result).toBe(true);
+  });
+
+  test('boolean string value -> parsed', async () => {
+    const result = await run(
+      Args.bool({ 'configure-web': 'false' }, 'configure-web'),
+      true,
+    );
+
+    expect(result).toBe(false);
+  });
+
+  test('invalid boolean value -> error', async () => {
+    const err = await runFail(
+      Args.bool({ 'configure-web': 'sometimes' }, 'configure-web'),
+      true,
+    );
+
+    expect(err.message).toBe('Invalid value for --configure-web');
+  });
+});
+
+describe('interactive', () => {
+  test('value already provided -> use it directly', async () => {
+    const result = await run(
+      Args.text(
+        { 'client-id': ' abc123.apps.googleusercontent.com ' },
+        'client-id',
+      ).pipe(Args.orPrompt(basePrompt), Args.required()),
+      false,
+    );
+
+    expect(result).toBe('abc123.apps.googleusercontent.com');
+  });
+
+  test('no value + user types a value -> trimmed result', async () => {
+    mockPromptReturn = ' GOCSPX-secret123 ';
+
+    const result = await run(
+      Args.text({}, 'client-secret').pipe(
+        Args.orPrompt(basePrompt),
+        Args.required(),
+      ),
+      false,
+    );
+
+    expect(result).toBe('GOCSPX-secret123');
+  });
+
+  test('no value + user enters empty + required -> error', async () => {
+    mockPromptReturn = '';
+
+    const err = await runFail(
+      Args.text({}, 'client-secret').pipe(
+        Args.orPrompt(basePrompt),
+        Args.required(),
+      ),
+      false,
+    );
+
+    expect(err.message).toBe('Missing required value for --client-secret');
+  });
+
+  test('no value + user enters empty + optional -> undefined', async () => {
+    mockPromptReturn = '';
+
+    const result = await run(
+      Args.text({}, 'custom-redirect-uri').pipe(Args.orPrompt(basePrompt)),
+      false,
+    );
+
+    expect(result).toBeUndefined();
+  });
+
+  test('no boolean value + user confirms -> result', async () => {
+    mockPromptReturn = true;
+
+    const result = await run(
+      Args.bool({}, 'configure-web').pipe(
+        Args.orConfirm({
+          promptText: 'Configure web redirect flow?',
+          defaultValue: false,
+        }),
+      ),
+      false,
+    );
+
+    expect(result).toBe(true);
+  });
+});

package/__tests__/oauthMock.ts

@@ -1,5 +1,6 @@
 import { Effect, Schema } from 'effect';
-import { optOrPrompt, validateRequired } from '../src/lib/ui.ts';
+import { Args } from '../src/lib/args.ts';
+import { validateRequired } from '../src/lib/ui.ts';
 import { UI } from '../src/ui/index.ts';
 import { BadArgsError } from '../src/errors.ts';
 
@@ -44,11 +45,8 @@ export const makeOAuthMock = (mocks: {
       (auth.oauth_clients ?? []).map((c: any) => c.client_name),
     );
     const suggested = findName(providerType, used);
-    const clientName = yield* optOrPrompt(opts.name, {
-      simpleName: '--name',
-      required: true,
-      skipIf: false,
-      prompt: {
+    const clientName = yield* Args.text(opts, 'name').pipe(
+      Args.orPrompt({
         prompt: 'Client Name:',
         defaultValue: suggested,
         placeholder: suggested,
@@ -57,8 +55,9 @@ export const makeOAuthMock = (mocks: {
           UI.modifiers.topPadding,
           UI.modifiers.dimOnComplete,
         ]),
-      },
-    });
+      }),
+      Args.required(),
+    );
     if (used.has(clientName || '')) {
       return yield* BadArgsError.make({
         message: `The unique name '${clientName}' is already in use.`,

package/__tests__/redirectUriPrompt.test.ts

@@ -3,7 +3,9 @@ import stripAnsi from 'strip-ansi';
 import { redirectUriPrompt } from '../src/commands/auth/client/shared.ts';
 
 test('redirectUriPrompt shows skipped when submitted empty', () => {
-  const prompt = redirectUriPrompt({ heading: 'Custom redirect URI (optional):' });
+  const prompt = redirectUriPrompt({
+    heading: 'Custom redirect URI (optional):',
+  });
 
   const output = stripAnsi(prompt.modifyOutput!('\n', 'submitted'));
 
@@ -11,13 +13,12 @@ test('redirectUriPrompt shows skipped when submitted empty', () => {
 });
 
 test('redirectUriPrompt shows submitted custom redirect URI', () => {
-  const prompt = redirectUriPrompt({ heading: 'Custom redirect URI (optional):' });
+  const prompt = redirectUriPrompt({
+    heading: 'Custom redirect URI (optional):',
+  });
 
   const output = stripAnsi(
-    prompt.modifyOutput!(
-      '\nhttps://example.com/oauth/callback',
-      'submitted',
-    ),
+    prompt.modifyOutput!('\nhttps://example.com/oauth/callback', 'submitted'),
   );
 
   expect(output).toContain(

package/dist/commands/auth/client/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/commands/auth/client/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAmD5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AA8pBF,eAAO,MAAM,gBAAgB;;;;wgBAwD5B,CAAC"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/commands/auth/client/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA+C5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AAuoBF,eAAO,MAAM,gBAAgB;;;;wgBAwD5B,CAAC"}

package/dist/commands/auth/client/add.js

@@ -1,7 +1,8 @@
 import { Effect, Match, Option, Schema } from 'effect';
 import { BadArgsError } from "../../../errors.js";
 import { GlobalOpts } from "../../../context/globalOpts.js";
-import { optOrPrompt, optOrPromptBoolean, runUIEffect, validateRequired, } from "../../../lib/ui.js";
+import { Args } from "../../../lib/args.js";
+import { runUIEffect, validateRequired } from "../../../lib/ui.js";
 import { addOAuthClient, findName, getClientNameAndProvider, getOrCreateProvider, GoogleAppTypeSchema, OAuthClient, } from "../../../lib/oauth.js";
 import { DEFAULT_OAUTH_CALLBACK_URL, GOOGLE_AUTHORIZATION_ENDPOINT, GOOGLE_DISCOVERY_ENDPOINT, GOOGLE_TOKEN_ENDPOINT, APPLE_AUTHORIZATION_ENDPOINT, APPLE_DISCOVERY_ENDPOINT, APPLE_TOKEN_ENDPOINT, clerkDomainFromPublishableKey, LINKEDIN_AUTHORIZATION_ENDPOINT, LINKEDIN_DISCOVERY_ENDPOINT, LINKEDIN_TOKEN_ENDPOINT, } from '@instantdb/platform';
 import { UI } from "../../../ui/index.js";
@@ -142,52 +143,35 @@ const handleGoogleClient = Effect.fn(function* (opts) {
     const { auth, provider } = yield* getOrCreateProvider('google');
     const usedClientNames = new Set((auth.oauth_clients ?? []).map((client) => client.client_name));
     const suggestedClientName = findName(`google-${appType}`, usedClientNames);
-    const clientName = yield* optOrPrompt(opts.name, {
-        simpleName: '--name',
-        required: true,
-        skipIf: false,
-        prompt: {
-            prompt: 'Client Name:',
-            defaultValue: suggestedClientName,
-            placeholder: suggestedClientName,
-            validate: validateRequired,
-            modifyOutput: UI.modifiers.piped([
-                UI.modifiers.topPadding,
-                UI.modifiers.dimOnComplete,
-            ]),
-        },
-    });
+    const clientName = yield* Args.text(opts, 'name').pipe(Args.orPrompt({
+        prompt: 'Client Name:',
+        defaultValue: suggestedClientName,
+        placeholder: suggestedClientName,
+        validate: validateRequired,
+        modifyOutput: UI.modifiers.piped([
+            UI.modifiers.topPadding,
+            UI.modifiers.dimOnComplete,
+        ]),
+    }), Args.required());
     if (usedClientNames.has(clientName || '')) {
         return yield* BadArgsError.make({
             message: `The unique name '${clientName}' is already in use.`,
         });
     }
-    const clientId = yield* optOrPrompt(opts['client-id'], {
-        simpleName: '--client-id',
-        required: !useSharedCredentials,
-        skipIf: useSharedCredentials,
-        skipMessage: '--client-id is not compatible with --dev-credentials. Drop one or the other.',
-        prompt: clientIdPrompt({ providerUrl: googleConsoleUrl }),
-    });
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.forbidIf(useSharedCredentials, {
+        message: '--client-id is not compatible with --dev-credentials. Drop one or the other.',
+    }), Args.orPromptIf(!useSharedCredentials, clientIdPrompt({ providerUrl: googleConsoleUrl })), Args.requiredIf(!useSharedCredentials));
     const usesCustomWebCredentials = !useSharedCredentials && appType === 'web';
-    const clientSecret = yield* optOrPrompt(opts['client-secret'], {
-        required: usesCustomWebCredentials,
-        skipIf: !usesCustomWebCredentials,
-        simpleName: '--client-secret',
-        skipMessage: useSharedCredentials
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.forbidIf(!usesCustomWebCredentials, {
+        message: useSharedCredentials
             ? '--client-secret is not compatible with --dev-credentials. Drop one or the other.'
             : undefined,
-        prompt: clientSecretPrompt({ providerUrl: googleConsoleUrl }),
-    });
-    const customRedirectUri = yield* optOrPrompt(opts['custom-redirect-uri'], {
-        required: false,
-        prompt: optionalRedirectPrompt,
-        simpleName: '--custom-redirect-uri',
-        skipIf: !usesCustomWebCredentials,
-        skipMessage: useSharedCredentials
+    }), Args.orPromptIf(usesCustomWebCredentials, clientSecretPrompt({ providerUrl: googleConsoleUrl })), Args.requiredIf(usesCustomWebCredentials));
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.forbidIf(!usesCustomWebCredentials, {
+        message: useSharedCredentials
             ? '--custom-redirect-uri is not compatible with --dev-credentials.'
             : 'Provided custom redirect URI when not using web app type.',
-    });
+    }), Args.orPromptIf(usesCustomWebCredentials, optionalRedirectPrompt));
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' }); // Should never reach this
     }
@@ -226,24 +210,9 @@ const handleGoogleClient = Effect.fn(function* (opts) {
 });
 const handleGithubClient = Effect.fn(function* (opts) {
     const { clientName, provider } = yield* getClientNameAndProvider('github', opts);
-    const clientId = yield* optOrPrompt(opts['client-id'], {
-        simpleName: '--client-id',
-        required: true,
-        skipIf: false,
-        prompt: clientIdPrompt({ providerUrl: githubDeveloperUrl }),
-    });
-    const clientSecret = yield* optOrPrompt(opts['client-secret'], {
-        required: true,
-        skipIf: false,
-        simpleName: '--client-secret',
-        prompt: clientSecretPrompt({ providerUrl: githubDeveloperUrl }),
-    });
-    const customRedirectUri = yield* optOrPrompt(opts['custom-redirect-uri'], {
-        required: false,
-        simpleName: '--custom-redirect-uri',
-        skipIf: false,
-        prompt: optionalRedirectPrompt,
-    });
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.orPrompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.orPrompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.orPrompt(optionalRedirectPrompt));
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -272,24 +241,9 @@ const handleGithubClient = Effect.fn(function* (opts) {
 });
 const handleLinkedInClient = Effect.fn(function* (opts) {
     const { clientName, provider } = yield* getClientNameAndProvider('linkedin', opts);
-    const clientId = yield* optOrPrompt(opts['client-id'], {
-        simpleName: '--client-id',
-        required: true,
-        skipIf: false,
-        prompt: clientIdPrompt({ providerUrl: linkedinDeveloperUrl }),
-    });
-    const clientSecret = yield* optOrPrompt(opts['client-secret'], {
-        required: true,
-        skipIf: false,
-        simpleName: '--client-secret',
-        prompt: clientSecretPrompt({ providerUrl: linkedinDeveloperUrl }),
-    });
-    const customRedirectUri = yield* optOrPrompt(opts['custom-redirect-uri'], {
-        required: false,
-        simpleName: '--custom-redirect-uri',
-        skipIf: false,
-        prompt: optionalRedirectPrompt,
-    });
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.orPrompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.orPrompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.orPrompt(optionalRedirectPrompt));
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -319,12 +273,7 @@ const handleLinkedInClient = Effect.fn(function* (opts) {
 const handleAppleClient = Effect.fn(function* (opts) {
     const { yes } = yield* GlobalOpts;
     const { clientName, provider } = yield* getClientNameAndProvider('apple', opts);
-    const servicesId = yield* optOrPrompt(opts['services-id'], {
-        simpleName: '--services-id',
-        required: true,
-        skipIf: false,
-        prompt: appleServicesIdPrompt({}),
-    });
+    const servicesId = yield* Args.text(opts, 'services-id').pipe(Args.orPrompt(appleServicesIdPrompt({})), Args.required());
     // If any web-flow flag is provided, enable web flow; otherwise ask
     // (non-interactively with --yes we default to native-only).
     const anyWebFlagProvided = Boolean(opts['team-id'] || opts['key-id'] || opts['private-key-file']);
@@ -332,49 +281,24 @@ const handleAppleClient = Effect.fn(function* (opts) {
         ? true
         : yes
             ? false
-            : yield* optOrPromptBoolean(undefined, {
-                simpleName: '--configure-web',
-                required: false,
-                skipIf: false,
-                prompt: {
-                    promptText: 'Configure web redirect flow? ' +
-                        chalk.dim('(requires Team ID, Key ID, and a .p8 private key from Apple)'),
-                    defaultValue: false,
-                },
-            });
+            : Boolean(yield* Args.bool(opts, 'configure-web').pipe(Args.orConfirm({
+                promptText: 'Configure web redirect flow? ' +
+                    chalk.dim('(requires Team ID, Key ID, and a .p8 private key from Apple)'),
+                defaultValue: false,
+            })));
     const skipWeb = !configureWeb;
     const webSkipMessage = 'requires configuring the web redirect flow (also provide --team-id, --key-id, and --private-key-file).';
-    const teamId = yield* optOrPrompt(opts['team-id'], {
-        simpleName: '--team-id',
-        required: true,
-        skipIf: skipWeb,
-        skipMessage: `--team-id ${webSkipMessage}`,
-        prompt: appleTeamIdPrompt({}),
-    });
-    const keyId = yield* optOrPrompt(opts['key-id'], {
-        simpleName: '--key-id',
-        required: true,
-        skipIf: skipWeb,
-        skipMessage: `--key-id ${webSkipMessage}`,
-        prompt: appleKeyIdPrompt({}),
-    });
-    const privateKeyPath = yield* optOrPrompt(opts['private-key-file'], {
-        simpleName: '--private-key-file',
-        required: true,
-        skipIf: skipWeb,
-        skipMessage: `--private-key-file ${webSkipMessage}`,
-        prompt: applePrivateKeyFilePrompt({}),
-    });
+    const teamId = yield* Args.text(opts, 'team-id').pipe(Args.forbidIf(skipWeb, { message: `--team-id ${webSkipMessage}` }), Args.orPromptIf(!skipWeb, appleTeamIdPrompt({})), Args.requiredIf(!skipWeb));
+    const keyId = yield* Args.text(opts, 'key-id').pipe(Args.forbidIf(skipWeb, { message: `--key-id ${webSkipMessage}` }), Args.orPromptIf(!skipWeb, appleKeyIdPrompt({})), Args.requiredIf(!skipWeb));
+    const privateKeyPath = yield* Args.text(opts, 'private-key-file').pipe(Args.forbidIf(skipWeb, {
+        message: `--private-key-file ${webSkipMessage}`,
+    }), Args.orPromptIf(!skipWeb, applePrivateKeyFilePrompt({})), Args.requiredIf(!skipWeb));
     const privateKey = privateKeyPath
         ? yield* readPrivateKeyFile(privateKeyPath)
         : undefined;
-    const customRedirectUri = yield* optOrPrompt(opts['custom-redirect-uri'], {
-        required: false,
-        simpleName: '--custom-redirect-uri',
-        skipIf: skipWeb,
-        skipMessage: `--custom-redirect-uri ${webSkipMessage}`,
-        prompt: optionalRedirectPrompt,
-    });
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.forbidIf(skipWeb, {
+        message: `--custom-redirect-uri ${webSkipMessage}`,
+    }), Args.orPromptIf(!skipWeb, optionalRedirectPrompt));
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -418,12 +342,7 @@ const handleAppleClient = Effect.fn(function* (opts) {
 });
 const handleClerkClient = Effect.fn(function* (opts) {
     const { clientName, provider } = yield* getClientNameAndProvider('clerk', opts);
-    const publishableKey = yield* optOrPrompt(opts['publishable-key'], {
-        simpleName: '--publishable-key',
-        required: true,
-        skipIf: false,
-        prompt: clerkPublishableKeyPrompt({}),
-    });
+    const publishableKey = yield* Args.text(opts, 'publishable-key').pipe(Args.orPrompt(clerkPublishableKeyPrompt({})), Args.required());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -459,12 +378,7 @@ const handleClerkClient = Effect.fn(function* (opts) {
 });
 const handleFirebaseClient = Effect.fn(function* (opts) {
     const { clientName, provider } = yield* getClientNameAndProvider('firebase', opts);
-    const projectId = yield* optOrPrompt(opts['project-id'], {
-        simpleName: '--project-id',
-        required: true,
-        skipIf: false,
-        prompt: firebaseProjectIdPrompt({}),
-    });
+    const projectId = yield* Args.text(opts, 'project-id').pipe(Args.orPrompt(firebaseProjectIdPrompt({})), Args.required());
     // typeguard
     if (!clientName || !projectId) {
         return yield* BadArgsError.make({