refactor: simplify provider capability projection

Author: thymikee

src/cli/connection/provider-policy.test.ts

@@ -3,42 +3,30 @@ import { test } from 'vitest';
 import {
   connectionProviderCapabilitiesForLease,
   connectionProviderCapabilitiesForVerification,
-  connectionProviderRequiresAppAttachment,
-  connectionProviderSupportsArtifacts,
-  connectionProviderSupportsDeferredAppSelection,
-  connectionProviderSupportsDirectPortReverse,
-  connectionProviderUsesCloudWebDriverLease,
 } from './provider-policy.ts';
 
-test('only providers declaring deferred app selection use app catalog before allocation', () => {
-  assert.equal(connectionProviderSupportsDeferredAppSelection('limrun'), true);
-  assert.equal(connectionProviderSupportsDeferredAppSelection('browserstack'), false);
-  assert.equal(connectionProviderSupportsDeferredAppSelection('aws-device-farm'), false);
-  assert.equal(connectionProviderSupportsDeferredAppSelection('proxy'), false);
-  assert.equal(connectionProviderSupportsDeferredAppSelection(undefined), false);
-});
-
-test('provider capabilities stay declared outside command implementations', () => {
-  assert.equal(connectionProviderRequiresAppAttachment('aws-device-farm'), true);
-  assert.equal(connectionProviderRequiresAppAttachment('browserstack'), false);
-  assert.equal(connectionProviderSupportsArtifacts('aws-device-farm'), true);
-  assert.equal(connectionProviderSupportsArtifacts('browserstack'), true);
-  assert.equal(connectionProviderSupportsArtifacts('limrun'), false);
-  assert.equal(connectionProviderSupportsDirectPortReverse('limrun'), true);
-  assert.equal(connectionProviderSupportsDirectPortReverse('aws-device-farm'), false);
-  assert.equal(connectionProviderUsesCloudWebDriverLease('browserstack'), true);
-  assert.equal(connectionProviderUsesCloudWebDriverLease('aws-device-farm'), true);
-  assert.equal(connectionProviderUsesCloudWebDriverLease('limrun'), false);
-});
-
-test('provider carriers resolve to semantic capabilities before commands inspect them', () => {
+test('provider carriers project provider identity into semantic capabilities', () => {
+  assert.deepEqual(connectionProviderCapabilitiesForLease({ leaseProvider: 'limrun' }), {
+    leaseKind: 'direct-device-provider',
+    requiresAppAttachment: false,
+    requiresRemoteDaemon: false,
+    supportsArtifacts: false,
+    supportsDeferredAppSelection: true,
+    supportsDirectPortReverse: true,
+    usesCloudWebDriverLease: false,
+  });
+  const browserStack = connectionProviderCapabilitiesForVerification({
+    provider: 'browserstack',
+  });
+  assert.equal(browserStack.supportsArtifacts, true);
+  assert.equal(browserStack.usesCloudWebDriverLease, true);
   assert.equal(
-    connectionProviderCapabilitiesForLease({ leaseProvider: 'limrun' })
-      .supportsDeferredAppSelection,
+    connectionProviderCapabilitiesForLease({ leaseProvider: 'aws-device-farm' })
+      .requiresAppAttachment,
     true,
   );
   assert.equal(
-    connectionProviderCapabilitiesForVerification({ provider: 'browserstack' }).supportsArtifacts,
-    true,
+    connectionProviderCapabilitiesForLease({ leaseProvider: 'proxy' }).leaseKind,
+    'proxy',
   );
 });

src/cli/connection/provider-policy.ts

@@ -17,8 +17,6 @@ type ConnectionProviderCapabilities = {
   usesCloudWebDriverLease: boolean;
 };
 
-const DEFERRED_APP_SELECTION_PROVIDERS = new Set<DirectDeviceConnectProvider>(['limrun']);
-
 export function isConnectProviderName(value: string | undefined): value is ConnectProvider {
   return value === 'cloud' || value === 'proxy' || isDirectDeviceConnectProvider(value);
 }
@@ -39,40 +37,6 @@ export function connectProviderNamesForError(): string {
   ].join(', ');
 }
 
-function connectionProviderRequiresRemoteDaemon(provider: string | undefined): boolean {
-  return !isDirectDeviceConnectProvider(provider);
-}
-
-export function connectionProviderSupportsDeferredAppSelection(
-  provider: string | undefined,
-): boolean {
-  return isDirectDeviceConnectProvider(provider) && DEFERRED_APP_SELECTION_PROVIDERS.has(provider);
-}
-
-export function connectionProviderRequiresAppAttachment(provider: string | undefined): boolean {
-  return provider === CLOUD_WEBDRIVER_PROVIDERS.awsDeviceFarm;
-}
-
-export function connectionProviderSupportsArtifacts(provider: string | undefined): boolean {
-  return isCloudWebDriverProviderName(provider);
-}
-
-export function connectionProviderSupportsDirectPortReverse(provider: string | undefined): boolean {
-  return provider === 'limrun';
-}
-
-export function connectionProviderUsesCloudWebDriverLease(provider: string | undefined): boolean {
-  return isCloudWebDriverProviderName(provider);
-}
-
-function connectionProviderLeaseKind(
-  provider: string | undefined,
-): 'proxy' | 'direct-device-provider' | 'remote-provider' {
-  if (provider === 'proxy') return 'proxy';
-  if (isDirectDeviceConnectProvider(provider)) return 'direct-device-provider';
-  return 'remote-provider';
-}
-
 export function connectionProviderCapabilitiesForLease(source: {
   leaseProvider?: string;
 }): ConnectionProviderCapabilities {
@@ -88,13 +52,20 @@ export function connectionProviderCapabilitiesForVerification(
 function connectionProviderCapabilities(
   provider: string | undefined,
 ): ConnectionProviderCapabilities {
+  const directDeviceProvider = isDirectDeviceConnectProvider(provider);
+  const cloudWebDriver = isCloudWebDriverProviderName(provider);
   return {
-    leaseKind: connectionProviderLeaseKind(provider),
-    requiresAppAttachment: connectionProviderRequiresAppAttachment(provider),
-    requiresRemoteDaemon: connectionProviderRequiresRemoteDaemon(provider),
-    supportsArtifacts: connectionProviderSupportsArtifacts(provider),
-    supportsDeferredAppSelection: connectionProviderSupportsDeferredAppSelection(provider),
-    supportsDirectPortReverse: connectionProviderSupportsDirectPortReverse(provider),
-    usesCloudWebDriverLease: connectionProviderUsesCloudWebDriverLease(provider),
+    leaseKind:
+      provider === 'proxy'
+        ? 'proxy'
+        : directDeviceProvider
+          ? 'direct-device-provider'
+          : 'remote-provider',
+    requiresAppAttachment: provider === CLOUD_WEBDRIVER_PROVIDERS.awsDeviceFarm,
+    requiresRemoteDaemon: !directDeviceProvider,
+    supportsArtifacts: cloudWebDriver,
+    supportsDeferredAppSelection: provider === 'limrun',
+    supportsDirectPortReverse: provider === 'limrun',
+    usesCloudWebDriverLease: cloudWebDriver,
   };
 }