instant-cli 1.0.23-branch-codex-cli-args-combinators.25394030897.1 → 1.0.23-branch-codex-cli-args-combinators.25395572961.1

package/.turbo/turbo-build.log

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

package/__tests__/args.test.ts

@@ -27,17 +27,20 @@ vi.mock('../src/ui/lib.ts', async (importOriginal) => {
 
 const basePrompt = { prompt: 'Client ID:' } as any;
 
-describe('forbidIf', () => {
-  test('condition=true + value provided -> error', async () => {
+describe('availableWhen', () => {
+  test('unavailable + 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.',
-        }),
-      ),
+      Args.from({
+        'custom-redirect-uri': 'https://mysite.com/callback',
+      })
+        .text('custom-redirect-uri')
+        .pipe(
+          Args.availableWhen(false, {
+            message:
+              'Provided custom redirect URI when not using web app type.',
+          }),
+          Args.optional(),
+        ),
       false,
     );
 
@@ -46,9 +49,30 @@ describe('forbidIf', () => {
     );
   });
 
-  test('condition=true + no value -> undefined', async () => {
+  test('unavailable + empty value provided -> error', async () => {
+    const err = await runFail(
+      Args.from({ 'custom-redirect-uri': '' })
+        .text('custom-redirect-uri')
+        .pipe(
+          Args.availableWhen(false, {
+            message:
+              'Provided custom redirect URI when not using web app type.',
+          }),
+          Args.optional(),
+        ),
+      false,
+    );
+
+    expect(err.message).toBe(
+      'Provided custom redirect URI when not using web app type.',
+    );
+  });
+
+  test('unavailable + no value -> undefined', async () => {
     const result = await run(
-      Args.text({}, 'custom-redirect-uri').pipe(Args.forbidIf(true)),
+      Args.from({})
+        .text('custom-redirect-uri')
+        .pipe(Args.availableWhen(false), Args.optional()),
       false,
     );
 
@@ -59,10 +83,9 @@ describe('forbidIf', () => {
 describe('non-interactive', () => {
   test('required missing value -> error', async () => {
     const err = await runFail(
-      Args.text({}, 'client-id').pipe(
-        Args.orPrompt(basePrompt),
-        Args.required(),
-      ),
+      Args.from({})
+        .text('client-id')
+        .pipe(Args.prompt(basePrompt), Args.required()),
       true,
     );
 
@@ -71,7 +94,7 @@ describe('non-interactive', () => {
 
   test('number value -> stringified', async () => {
     const result = await run(
-      Args.text({ 'client-id': 42 }, 'client-id').pipe(Args.required()),
+      Args.from({ 'client-id': 42 }).text('client-id').pipe(Args.required()),
       true,
     );
 
@@ -80,7 +103,7 @@ describe('non-interactive', () => {
 
   test('non-string/number value -> error', async () => {
     const err = await runFail(
-      Args.text({ 'client-id': true }, 'client-id').pipe(Args.required()),
+      Args.from({ 'client-id': true }).text('client-id').pipe(Args.required()),
       true,
     );
 
@@ -89,10 +112,9 @@ describe('non-interactive', () => {
 
   test('valid string -> trimmed value', async () => {
     const result = await run(
-      Args.text(
-        { 'client-id': ' abc123.apps.googleusercontent.com ' },
-        'client-id',
-      ).pipe(Args.required()),
+      Args.from({ 'client-id': ' abc123.apps.googleusercontent.com ' })
+        .text('client-id')
+        .pipe(Args.required()),
       true,
     );
 
@@ -100,14 +122,30 @@ describe('non-interactive', () => {
   });
 
   test('optional missing value -> undefined', async () => {
-    const result = await run(Args.text({}, 'custom-redirect-uri'), true);
+    const result = await run(
+      Args.from({}).text('custom-redirect-uri').pipe(Args.optional()),
+      true,
+    );
 
     expect(result).toBeUndefined();
   });
 
+  test('flag name can include leading dashes', async () => {
+    const result = await run(
+      Args.from({ 'client-id': 'abc123' })
+        .text('--client-id')
+        .pipe(Args.required()),
+      true,
+    );
+
+    expect(result).toBe('abc123');
+  });
+
   test('boolean value -> parsed', async () => {
     const result = await run(
-      Args.bool({ 'configure-web': true }, 'configure-web'),
+      Args.from({ 'configure-web': true })
+        .bool('configure-web')
+        .pipe(Args.optional()),
       true,
     );
 
@@ -116,7 +154,9 @@ describe('non-interactive', () => {
 
   test('boolean string value -> parsed', async () => {
     const result = await run(
-      Args.bool({ 'configure-web': 'false' }, 'configure-web'),
+      Args.from({ 'configure-web': 'false' })
+        .bool('configure-web')
+        .pipe(Args.optional()),
       true,
     );
 
@@ -125,7 +165,9 @@ describe('non-interactive', () => {
 
   test('invalid boolean value -> error', async () => {
     const err = await runFail(
-      Args.bool({ 'configure-web': 'sometimes' }, 'configure-web'),
+      Args.from({ 'configure-web': 'sometimes' })
+        .bool('configure-web')
+        .pipe(Args.optional()),
       true,
     );
 
@@ -136,10 +178,9 @@ describe('non-interactive', () => {
 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()),
+      Args.from({ 'client-id': ' abc123.apps.googleusercontent.com ' })
+        .text('client-id')
+        .pipe(Args.prompt(basePrompt), Args.required()),
       false,
     );
 
@@ -150,10 +191,9 @@ describe('interactive', () => {
     mockPromptReturn = ' GOCSPX-secret123 ';
 
     const result = await run(
-      Args.text({}, 'client-secret').pipe(
-        Args.orPrompt(basePrompt),
-        Args.required(),
-      ),
+      Args.from({})
+        .text('client-secret')
+        .pipe(Args.prompt(basePrompt), Args.required()),
       false,
     );
 
@@ -164,10 +204,9 @@ describe('interactive', () => {
     mockPromptReturn = '';
 
     const err = await runFail(
-      Args.text({}, 'client-secret').pipe(
-        Args.orPrompt(basePrompt),
-        Args.required(),
-      ),
+      Args.from({})
+        .text('client-secret')
+        .pipe(Args.prompt(basePrompt), Args.required()),
       false,
     );
 
@@ -178,7 +217,9 @@ describe('interactive', () => {
     mockPromptReturn = '';
 
     const result = await run(
-      Args.text({}, 'custom-redirect-uri').pipe(Args.orPrompt(basePrompt)),
+      Args.from({})
+        .text('custom-redirect-uri')
+        .pipe(Args.prompt(basePrompt), Args.optional()),
       false,
     );
 
@@ -189,12 +230,15 @@ describe('interactive', () => {
     mockPromptReturn = true;
 
     const result = await run(
-      Args.bool({}, 'configure-web').pipe(
-        Args.orConfirm({
-          promptText: 'Configure web redirect flow?',
-          defaultValue: false,
-        }),
-      ),
+      Args.from({})
+        .bool('configure-web')
+        .pipe(
+          Args.confirm({
+            promptText: 'Configure web redirect flow?',
+            defaultValue: false,
+          }),
+          Args.optional(),
+        ),
       false,
     );
 

package/__tests__/oauthMock.ts

@@ -40,13 +40,14 @@ export const makeOAuthMock = (mocks: {
     providerType: string,
     opts: Record<string, unknown>,
   ) {
+    const args = Args.from(opts);
     const { auth, provider } = yield* getOrCreateProvider(providerType);
     const used: Set<string> = new Set(
       (auth.oauth_clients ?? []).map((c: any) => c.client_name),
     );
     const suggested = findName(providerType, used);
-    const clientName = yield* Args.text(opts, 'name').pipe(
-      Args.orPrompt({
+    const clientName = yield* args.text('name').pipe(
+      Args.prompt({
         prompt: 'Client Name:',
         defaultValue: suggested,
         placeholder: suggested,

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;AA+C5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AAuoBF,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;AA4C5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AAopBF,eAAO,MAAM,gBAAgB;;;;wgBAwD5B,CAAC"}

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

@@ -9,7 +9,7 @@ import { UI } from "../../../ui/index.js";
 import chalk from 'chalk';
 import boxen from 'boxen';
 import { link } from "../../../logging.js";
-import { appleKeyIdPrompt, applePrivateKeyFilePrompt, appleServicesIdPrompt, appleTeamIdPrompt, clerkPublishableKeyPrompt, clientIdPrompt, clientSecretPrompt, firebaseDiscoveryEndpoint, firebaseProjectIdPrompt, getFlag, hasAnyFlag, isTrueFlag, readPrivateKeyFile, redirectSetupMessages, redirectUriPrompt, validateFirebaseProjectId, } from "./shared.js";
+import { appleKeyIdPrompt, applePrivateKeyFilePrompt, appleServicesIdPrompt, appleTeamIdPrompt, clerkPublishableKeyPrompt, clientIdPrompt, clientSecretPrompt, firebaseDiscoveryEndpoint, firebaseProjectIdPrompt, readPrivateKeyFile, redirectSetupMessages, redirectUriPrompt, validateFirebaseProjectId, } from "./shared.js";
 export const ClientTypeSchema = Schema.Literal('google', 'github', 'apple', 'linkedin', 'clerk', 'firebase');
 const googleConsoleUrl = 'https://console.developers.google.com/apis/credentials';
 const githubDeveloperUrl = 'https://github.com/settings/developers';
@@ -70,8 +70,9 @@ const selectGoogleCredentialMode = Effect.fn(function* () {
 });
 const resolveGoogleCredentialMode = Effect.fn(function* ({ appType, opts, }) {
     const { yes } = yield* GlobalOpts;
-    const devCredentialsFlag = isTrueFlag(getFlag(opts, 'dev-credentials'));
-    const hasProvidedSomeCustomCredentials = hasAnyFlag(opts, [
+    const args = Args.from(opts);
+    const devCredentialsFlag = args.isTrue('dev-credentials');
+    const hasProvidedSomeCustomCredentials = args.hasAny([
         'client-id',
         'client-secret',
         'custom-redirect-uri',
@@ -132,6 +133,7 @@ const printGoogleCustomCredentialsClient = Effect.fn(function* ({ appType, clien
     ].join('\n'), { dimBorder: true, padding: { right: 1, left: 1 } }));
 });
 const handleGoogleClient = Effect.fn(function* (opts) {
+    const args = Args.from(opts);
     // This one requires special logic for getting client name
     // because the suggested name includes the app type
     const appType = yield* selectGoogleAppType(opts['app-type']);
@@ -143,7 +145,7 @@ 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* Args.text(opts, 'name').pipe(Args.orPrompt({
+    const clientName = yield* args.text('name').pipe(Args.prompt({
         prompt: 'Client Name:',
         defaultValue: suggestedClientName,
         placeholder: suggestedClientName,
@@ -158,20 +160,20 @@ const handleGoogleClient = Effect.fn(function* (opts) {
             message: `The unique name '${clientName}' is already in use.`,
         });
     }
-    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.forbidIf(useSharedCredentials, {
+    const clientId = yield* args.text('client-id').pipe(Args.availableWhen(!useSharedCredentials, {
         message: '--client-id is not compatible with --dev-credentials. Drop one or the other.',
-    }), Args.orPromptIf(!useSharedCredentials, clientIdPrompt({ providerUrl: googleConsoleUrl })), Args.requiredIf(!useSharedCredentials));
+    }), Args.prompt(clientIdPrompt({ providerUrl: googleConsoleUrl })), Args.required());
     const usesCustomWebCredentials = !useSharedCredentials && appType === 'web';
-    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.forbidIf(!usesCustomWebCredentials, {
+    const clientSecret = yield* args.text('client-secret').pipe(Args.availableWhen(usesCustomWebCredentials, {
         message: useSharedCredentials
             ? '--client-secret is not compatible with --dev-credentials. Drop one or the other.'
             : undefined,
-    }), Args.orPromptIf(usesCustomWebCredentials, clientSecretPrompt({ providerUrl: googleConsoleUrl })), Args.requiredIf(usesCustomWebCredentials));
-    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.forbidIf(!usesCustomWebCredentials, {
+    }), Args.prompt(clientSecretPrompt({ providerUrl: googleConsoleUrl })), Args.required());
+    const customRedirectUri = yield* args.text('custom-redirect-uri').pipe(Args.availableWhen(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));
+    }), Args.prompt(optionalRedirectPrompt), Args.optional());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' }); // Should never reach this
     }
@@ -209,10 +211,17 @@ const handleGoogleClient = Effect.fn(function* (opts) {
     });
 });
 const handleGithubClient = Effect.fn(function* (opts) {
+    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('github', opts);
-    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));
+    const clientId = yield* args
+        .text('client-id')
+        .pipe(Args.prompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const clientSecret = yield* args
+        .text('client-secret')
+        .pipe(Args.prompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* args
+        .text('custom-redirect-uri')
+        .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -240,10 +249,17 @@ const handleGithubClient = Effect.fn(function* (opts) {
     ].join('\n'), { dimBorder: true, padding: { right: 1, left: 1 } }));
 });
 const handleLinkedInClient = Effect.fn(function* (opts) {
+    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('linkedin', opts);
-    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));
+    const clientId = yield* args
+        .text('client-id')
+        .pipe(Args.prompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const clientSecret = yield* args
+        .text('client-secret')
+        .pipe(Args.prompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* args
+        .text('custom-redirect-uri')
+        .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -272,33 +288,40 @@ const handleLinkedInClient = Effect.fn(function* (opts) {
 });
 const handleAppleClient = Effect.fn(function* (opts) {
     const { yes } = yield* GlobalOpts;
+    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('apple', opts);
-    const servicesId = yield* Args.text(opts, 'services-id').pipe(Args.orPrompt(appleServicesIdPrompt({})), Args.required());
+    const servicesId = yield* args
+        .text('services-id')
+        .pipe(Args.prompt(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']);
+    const anyWebFlagProvided = Boolean(args.hasAny(['team-id', 'key-id', 'private-key-file']));
     const configureWeb = anyWebFlagProvided
         ? true
         : yes
             ? false
-            : Boolean(yield* Args.bool(opts, 'configure-web').pipe(Args.orConfirm({
+            : Boolean(yield* args.bool('configure-web').pipe(Args.confirm({
                 promptText: 'Configure web redirect flow? ' +
                     chalk.dim('(requires Team ID, Key ID, and a .p8 private key from Apple)'),
                 defaultValue: false,
-            })));
+            }), Args.optional()));
     const skipWeb = !configureWeb;
     const webSkipMessage = 'requires configuring the web redirect flow (also provide --team-id, --key-id, and --private-key-file).';
-    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, {
+    const teamId = yield* args
+        .text('team-id')
+        .pipe(Args.availableWhen(!skipWeb, { message: `--team-id ${webSkipMessage}` }), Args.prompt(appleTeamIdPrompt({})), Args.required());
+    const keyId = yield* args
+        .text('key-id')
+        .pipe(Args.availableWhen(!skipWeb, { message: `--key-id ${webSkipMessage}` }), Args.prompt(appleKeyIdPrompt({})), Args.required());
+    const privateKeyPath = yield* args.text('private-key-file').pipe(Args.availableWhen(!skipWeb, {
         message: `--private-key-file ${webSkipMessage}`,
-    }), Args.orPromptIf(!skipWeb, applePrivateKeyFilePrompt({})), Args.requiredIf(!skipWeb));
+    }), Args.prompt(applePrivateKeyFilePrompt({})), Args.required());
     const privateKey = privateKeyPath
         ? yield* readPrivateKeyFile(privateKeyPath)
         : undefined;
-    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.forbidIf(skipWeb, {
+    const customRedirectUri = yield* args.text('custom-redirect-uri').pipe(Args.availableWhen(!skipWeb, {
         message: `--custom-redirect-uri ${webSkipMessage}`,
-    }), Args.orPromptIf(!skipWeb, optionalRedirectPrompt));
+    }), Args.prompt(optionalRedirectPrompt), Args.optional());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -341,8 +364,11 @@ const handleAppleClient = Effect.fn(function* (opts) {
     }));
 });
 const handleClerkClient = Effect.fn(function* (opts) {
+    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('clerk', opts);
-    const publishableKey = yield* Args.text(opts, 'publishable-key').pipe(Args.orPrompt(clerkPublishableKeyPrompt({})), Args.required());
+    const publishableKey = yield* args
+        .text('publishable-key')
+        .pipe(Args.prompt(clerkPublishableKeyPrompt({})), Args.required());
     if (!clientName) {
         return yield* BadArgsError.make({ message: 'Client name is required.' });
     }
@@ -377,8 +403,11 @@ const handleClerkClient = Effect.fn(function* (opts) {
 }`, { borderStyle: 'none' }));
 });
 const handleFirebaseClient = Effect.fn(function* (opts) {
+    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('firebase', opts);
-    const projectId = yield* Args.text(opts, 'project-id').pipe(Args.orPrompt(firebaseProjectIdPrompt({})), Args.required());
+    const projectId = yield* args
+        .text('project-id')
+        .pipe(Args.prompt(firebaseProjectIdPrompt({})), Args.required());
     // typeguard
     if (!clientName || !projectId) {
         return yield* BadArgsError.make({