Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions packages/worker/src/activity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,13 @@ type ContractResultActivitiesImplementations<
// All workflow-specific activities merged; workflows without activities
// are remapped away entirely instead of demanding a `{}` entry.
{
[TWorkflow in keyof TContract["workflows"] as WorkflowHasActivities<
TContract["workflows"][TWorkflow]
> extends true
? TWorkflow
: never]: TContract["workflows"][TWorkflow]["activities"] extends Record<
string,
ActivityDefinition
>
[
TWorkflow in keyof TContract["workflows"] as WorkflowHasActivities<
TContract["workflows"][TWorkflow]
> extends true
? TWorkflow
: never
]: TContract["workflows"][TWorkflow]["activities"] extends Record<string, ActivityDefinition>
? ResultActivitiesImplementations<TContract["workflows"][TWorkflow]["activities"], TContext>
: never;
};
Expand Down Expand Up @@ -768,7 +767,9 @@ export type ActivitiesHandler<TContract extends ContractDefinition> =
// All workflow-specific activities merged at root level (flat)
UnionToIntersection<
{
[TWorkflow in keyof TContract["workflows"]]: TContract["workflows"][TWorkflow]["activities"] extends Record<
[
TWorkflow in keyof TContract["workflows"]
]: TContract["workflows"][TWorkflow]["activities"] extends Record<
string,
ActivityDefinition
>
Expand Down
164 changes: 82 additions & 82 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ catalog:
knip: 6.32.1
lefthook: 2.1.10
mermaid: 11.16.1
oxfmt: 0.62.0
oxfmt: 0.63.0
oxlint: 1.78.0
pino: 10.3.1
pino-pretty: 13.1.3
Expand Down
Loading