Lint fix and inlining some types/functions

Author: THardy98

packages/client/src/helpers.ts

@@ -12,9 +12,6 @@ import { decodeMapFromPayloads } from '@temporalio/common/lib/internal-non-workf
 import { temporal, google } from '@temporalio/proto';
 import {
   CountWorkflowExecution,
-  CountWorkflowExecutionsAggregationGroup,
-  RawCountWorkflowExecutions,
-  RawCountWorkflowExecutionsAggregationGroup,
   RawWorkflowExecutionInfo,
   WorkflowExecutionInfo,
   WorkflowExecutionStatusName,
@@ -89,21 +86,19 @@ export async function executionInfoFromRaw<T>(
   };
 }
 
-export function decodeCountWorkflowExecutionsResponse(raw: RawCountWorkflowExecutions): CountWorkflowExecution {
+export function decodeCountWorkflowExecutionsResponse(
+  raw: temporal.api.workflowservice.v1.ICountWorkflowExecutionsResponse
+): CountWorkflowExecution {
   return {
     // Note: lossy conversion of Long to number
     count: raw.count!.toNumber(),
-    groups: raw.groups!.map((group) => executionCountAggregationGroupFromRaw(group)),
-  };
-}
-
-export function executionCountAggregationGroupFromRaw(
-  raw: RawCountWorkflowExecutionsAggregationGroup
-): CountWorkflowExecutionsAggregationGroup {
-  return {
-    // Note: lossy conversion of Long to number
-    count: raw.count!.toNumber(),
-    groupValues: raw.groupValues!.map((group_value) => searchAttributePayloadConverter.fromPayload(group_value)),
+    groups: raw.groups!.map((group) => {
+      return {
+        // Note: lossy conversion of Long to number
+        count: group.count!.toNumber(),
+        groupValues: group.groupValues!.map((value) => searchAttributePayloadConverter.fromPayload(value)),
+      };
+    }),
   };
 }
 

packages/client/src/types.ts

@@ -14,9 +14,6 @@ export type GetWorkflowExecutionHistoryRequest =
 export type DescribeWorkflowExecutionResponse =
   proto.temporal.api.workflowservice.v1.IDescribeWorkflowExecutionResponse;
 export type RawWorkflowExecutionInfo = proto.temporal.api.workflow.v1.IWorkflowExecutionInfo;
-export type RawCountWorkflowExecutions = proto.temporal.api.workflowservice.v1.ICountWorkflowExecutionsResponse;
-export type RawCountWorkflowExecutionsAggregationGroup =
-  proto.temporal.api.workflowservice.v1.CountWorkflowExecutionsResponse.IAggregationGroup;
 export type TerminateWorkflowExecutionResponse =
   proto.temporal.api.workflowservice.v1.ITerminateWorkflowExecutionResponse;
 export type RequestCancelWorkflowExecutionResponse =
@@ -57,12 +54,10 @@ export interface WorkflowExecutionInfo {
 
 export interface CountWorkflowExecution {
   count: number;
-  groups: CountWorkflowExecutionsAggregationGroup[];
-}
-
-export interface CountWorkflowExecutionsAggregationGroup {
-  count: number;
-  groupValues: SearchAttributeValue[];
+  groups: {
+    count: number;
+    groupValues: SearchAttributeValue[];
+  }[];
 }
 
 export type WorkflowExecutionDescription = Replace<

packages/test/src/test-integration-workflows.ts

@@ -1,7 +1,6 @@
 import { randomUUID } from 'crypto';
 import { ExecutionContext } from 'ava';
 import { firstValueFrom, Subject } from 'rxjs';
-import asyncRetry from 'async-retry';
 import { CountWorkflowExecution, WorkflowFailedError } from '@temporalio/client';
 import * as activity from '@temporalio/activity';
 import { msToNumber, tsToMs } from '@temporalio/common/lib/time';
@@ -16,7 +15,7 @@ import { activityStartedSignal } from './workflows/definitions';
 import * as workflows from './workflows';
 import { Context, helpers, makeTestFunction } from './helpers-integration';
 import { overrideSdkInternalFlag } from './mock-internal-flags';
-import { asSdkLoggerSink, loadHistory, RUN_TIME_SKIPPING_TESTS, waitUntil } from './helpers';
+import { asSdkLoggerSink, loadHistory, RUN_TIME_SKIPPING_TESTS } from './helpers';
 
 const test = makeTestFunction({
   workflowsPath: __filename,
@@ -1282,16 +1281,12 @@ test('Count workflow executions', async (t) => {
   }
 
   await worker.runUntil(async () => {
-    try {
-      // Run 3 workflows that complete.
-      await Promise.all([
-        executeWorkflow(completableWorkflow, { args: [true] }),
-        executeWorkflow(completableWorkflow, { args: [true] }),
-        executeWorkflow(completableWorkflow, { args: [true] }),
-      ]);
-    } catch (err) {
-      throw new Error('executing workflow unexpectedly failed');
-    }
+    // Run 3 workflows that complete.
+    await Promise.all([
+      executeWorkflow(completableWorkflow, { args: [true] }),
+      executeWorkflow(completableWorkflow, { args: [true] }),
+      executeWorkflow(completableWorkflow, { args: [true] }),
+    ]);
   });
 
   const actualTotal = await client.workflow.count(`TaskQueue = '${taskQueue}'`);