@contember/engine-actions 2.1.0-alpha.30 → 2.1.0-alpha.35

package/src/graphql/schema/index.ts

@@ -45,12 +45,12 @@ export type EventArgs = {
 }
 
 export type EventState =
-  | 'created'
-  | 'failed'
-  | 'processing'
-  | 'retrying'
-  | 'stopped'
-  | 'succeed'
+	| 'created'
+	| 'failed'
+	| 'processing'
+	| 'retrying'
+	| 'stopped'
+	| 'succeed'
 
 export type Mutation = {
 	readonly __typename?: 'Mutation'
@@ -60,17 +60,14 @@ export type Mutation = {
 	readonly stopEvent: StopEventResponse
 }
 
-
 export type MutationRetryEventArgs = {
 	id: Scalars['Uuid']['input']
 }
 
-
 export type MutationSetVariablesArgs = {
 	args: SetVariablesArgs
 }
 
-
 export type MutationStopEventArgs = {
 	id: Scalars['Uuid']['input']
 }
@@ -89,22 +86,18 @@ export type Query = {
 	readonly variables: ReadonlyArray<Variable>
 }
 
-
 export type QueryEventArgs = {
 	id: Scalars['Uuid']['input']
 }
 
-
 export type QueryEventsInProcessingArgs = {
 	args?: InputMaybe<EventArgs>
 }
 
-
 export type QueryEventsToProcessArgs = {
 	args?: InputMaybe<EventArgs>
 }
 
-
 export type QueryFailedEventsArgs = {
 	args?: InputMaybe<EventArgs>
 }
@@ -126,9 +119,9 @@ export type SetVariablesArgs = {
  * - APPEND_ONLY_MISSING appends values if not already exist
  */
 export type SetVariablesMode =
-  | 'APPEND_ONLY_MISSING'
-  | 'MERGE'
-  | 'SET'
+	| 'APPEND_ONLY_MISSING'
+	| 'MERGE'
+	| 'SET'
 
 export type SetVariablesResponse = {
 	readonly __typename?: 'SetVariablesResponse'
@@ -151,35 +144,34 @@ export type VariableInput = {
 	readonly value: Scalars['String']['input']
 }
 
-
-
 export type ResolverTypeWrapper<T> = Promise<T> | T
 
-
 export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
 	resolve: ResolverFn<TResult, TParent, TContext, TArgs>
 }
-export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> = ResolverFn<TResult, TParent, TContext, TArgs> | ResolverWithResolve<TResult, TParent, TContext, TArgs>
+export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
+	| ResolverFn<TResult, TParent, TContext, TArgs>
+	| ResolverWithResolve<TResult, TParent, TContext, TArgs>
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (
 	parent: TParent,
 	args: TArgs,
 	context: TContext,
-	info: GraphQLResolveInfo
+	info: GraphQLResolveInfo,
 ) => Promise<TResult> | TResult
 
 export type SubscriptionSubscribeFn<TResult, TParent, TContext, TArgs> = (
 	parent: TParent,
 	args: TArgs,
 	context: TContext,
-	info: GraphQLResolveInfo
+	info: GraphQLResolveInfo,
 ) => AsyncIterable<TResult> | Promise<AsyncIterable<TResult>>
 
 export type SubscriptionResolveFn<TResult, TParent, TContext, TArgs> = (
 	parent: TParent,
 	args: TArgs,
 	context: TContext,
-	info: GraphQLResolveInfo
+	info: GraphQLResolveInfo,
 ) => TResult | Promise<TResult>
 
 export interface SubscriptionSubscriberObject<TResult, TKey extends string, TParent, TContext, TArgs> {
@@ -193,17 +185,17 @@ export interface SubscriptionResolverObject<TResult, TParent, TContext, TArgs> {
 }
 
 export type SubscriptionObject<TResult, TKey extends string, TParent, TContext, TArgs> =
-  | SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs>
-  | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>
+	| SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs>
+	| SubscriptionResolverObject<TResult, TParent, TContext, TArgs>
 
 export type SubscriptionResolver<TResult, TKey extends string, TParent = {}, TContext = {}, TArgs = {}> =
-  | ((...args: any[]) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
-  | SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>
+	| ((...args: any[]) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
+	| SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>
 
 export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
 	parent: TParent,
 	context: TContext,
-	info: GraphQLResolveInfo
+	info: GraphQLResolveInfo,
 ) => Maybe<TTypes> | Promise<Maybe<TTypes>>
 
 export type IsTypeOfResolverFn<T = {}, TContext = {}> = (obj: T, context: TContext, info: GraphQLResolveInfo) => boolean | Promise<boolean>
@@ -215,11 +207,9 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 	parent: TParent,
 	args: TArgs,
 	context: TContext,
-	info: GraphQLResolveInfo
+	info: GraphQLResolveInfo,
 ) => TResult | Promise<TResult>
 
-
-
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
 	Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>
@@ -298,7 +288,10 @@ export type MutationResolvers<ContextType = any, ParentType extends ResolversPar
 	stopEvent?: Resolver<ResolversTypes['StopEventResponse'], ParentType, ContextType, RequireFields<MutationStopEventArgs, 'id'>>
 }
 
-export type ProcessBatchResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['ProcessBatchResponse'] = ResolversParentTypes['ProcessBatchResponse']> = {
+export type ProcessBatchResponseResolvers<
+	ContextType = any,
+	ParentType extends ResolversParentTypes['ProcessBatchResponse'] = ResolversParentTypes['ProcessBatchResponse'],
+> = {
 	ok?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
@@ -311,17 +304,26 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
 	variables?: Resolver<ReadonlyArray<ResolversTypes['Variable']>, ParentType, ContextType>
 }
 
-export type RetryEventResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['RetryEventResponse'] = ResolversParentTypes['RetryEventResponse']> = {
+export type RetryEventResponseResolvers<
+	ContextType = any,
+	ParentType extends ResolversParentTypes['RetryEventResponse'] = ResolversParentTypes['RetryEventResponse'],
+> = {
 	ok?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
 
-export type SetVariablesResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['SetVariablesResponse'] = ResolversParentTypes['SetVariablesResponse']> = {
+export type SetVariablesResponseResolvers<
+	ContextType = any,
+	ParentType extends ResolversParentTypes['SetVariablesResponse'] = ResolversParentTypes['SetVariablesResponse'],
+> = {
 	ok?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
 
-export type StopEventResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['StopEventResponse'] = ResolversParentTypes['StopEventResponse']> = {
+export type StopEventResponseResolvers<
+	ContextType = any,
+	ParentType extends ResolversParentTypes['StopEventResponse'] = ResolversParentTypes['StopEventResponse'],
+> = {
 	ok?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
@@ -349,4 +351,3 @@ export type Resolvers<ContextType = any> = {
 	Uuid?: GraphQLScalarType
 	Variable?: VariableResolvers<ContextType>
 }
-

package/src/index.ts

@@ -7,7 +7,13 @@ import { MasterContainerBuilder, MasterContainerHook } from '@contember/engine-h
 import { ActionsApiMiddlewareFactory } from './graphql/http/ActionsApiMiddlewareFactory'
 import { ActionsGraphQLHandlerFactory } from './graphql/http/ActionsGraphQLHandlerFactory'
 import { ResolversFactory } from './graphql/resolvers/ResolversFactory'
-import { EventsQueryResolver, ProcessBatchMutationResolver, RetryEventMutationResolver, SetVariablesMutationResolver, StopEventMutationResolver } from './graphql/resolvers'
+import {
+	EventsQueryResolver,
+	ProcessBatchMutationResolver,
+	RetryEventMutationResolver,
+	SetVariablesMutationResolver,
+	StopEventMutationResolver,
+} from './graphql/resolvers'
 import { EventDispatcher } from './dispatch/EventDispatcher'
 import { EventsRepository } from './dispatch/EventsRepository'
 import { TargetHandlerResolver } from './dispatch/TargetHandlerResolver'
@@ -22,13 +28,7 @@ import { AccessEvaluator, Authorizator } from '@contember/authorization'
 import { ActionsPermissionsFactory } from './authorization'
 import { WebhookFetcherNative } from './dispatch/WebhookFetcher'
 
-export {
-	TriggerListenersFactory,
-	TriggerListenersStore,
-	TriggerHandler,
-	TriggerPayloadManager,
-	TriggerIndirectChangesFetcher,
-} from './triggers'
+export { TriggerHandler, TriggerIndirectChangesFetcher, TriggerListenersFactory, TriggerListenersStore, TriggerPayloadManager } from './triggers'
 export { ActionsExecutionContainerHookFactory } from './ActionsExecutionContainerHookFactory'
 export { ListenerStoreProvider } from './ListenerStoreProvider'
 
@@ -65,33 +65,54 @@ export default class ActionsPlugin implements Plugin {
 				.addService('actions_authorizator', () => {
 					return new Authorizator.Default(new AccessEvaluator.PermissionEvaluator(new ActionsPermissionsFactory().create()))
 				})
-				.setupService('application', (it, { projectContextResolver, debugMode, actions_eventRepository, actions_eventDispatcher, actions_dispatchWorkerSupervisorFactory, actions_variableManager, actions_authorizator }) => {
-					const handlerFactory = new ActionsGraphQLHandlerFactory()
-					const eventsQueryResolver = new EventsQueryResolver()
-					const processBatchMutationResolver = new ProcessBatchMutationResolver(actions_eventDispatcher)
-					const variablesQueryResolver = new VariablesQueryResolver(actions_variableManager)
-					const setVariablesMutationResolver = new SetVariablesMutationResolver(actions_variableManager)
-					const resolversFactory = new ResolversFactory(
-						eventsQueryResolver,
-						processBatchMutationResolver,
-						variablesQueryResolver,
-						setVariablesMutationResolver,
-						new RetryEventMutationResolver(actions_eventRepository),
-						new StopEventMutationResolver(actions_eventRepository),
-					)
+				.setupService(
+					'application',
+					(
+						it,
+						{
+							projectContextResolver,
+							debugMode,
+							actions_eventRepository,
+							actions_eventDispatcher,
+							actions_dispatchWorkerSupervisorFactory,
+							actions_variableManager,
+							actions_authorizator,
+						},
+					) => {
+						const handlerFactory = new ActionsGraphQLHandlerFactory()
+						const eventsQueryResolver = new EventsQueryResolver()
+						const processBatchMutationResolver = new ProcessBatchMutationResolver(actions_eventDispatcher)
+						const variablesQueryResolver = new VariablesQueryResolver(actions_variableManager)
+						const setVariablesMutationResolver = new SetVariablesMutationResolver(actions_variableManager)
+						const resolversFactory = new ResolversFactory(
+							eventsQueryResolver,
+							processBatchMutationResolver,
+							variablesQueryResolver,
+							setVariablesMutationResolver,
+							new RetryEventMutationResolver(actions_eventRepository),
+							new StopEventMutationResolver(actions_eventRepository),
+						)
 
-					const actionsContextResolver = new ActionsContextResolver(debugMode, projectContextResolver)
-					const actionsMiddlewareFactory = new ActionsApiMiddlewareFactory(actionsContextResolver, handlerFactory.create(resolversFactory), actions_authorizator)
-					const actionsWebsocketMiddlewareFactory = new ActionsWebsocketControllerFactory(debugMode, actionsContextResolver, actions_dispatchWorkerSupervisorFactory)
-					it.addRoute('actions', '/actions/:projectSlug', actionsMiddlewareFactory.create())
-					it.addWebsocketRoute('actions', '/actions/_worker', actionsWebsocketMiddlewareFactory.create())
-				})
+						const actionsContextResolver = new ActionsContextResolver(debugMode, projectContextResolver)
+						const actionsMiddlewareFactory = new ActionsApiMiddlewareFactory(
+							actionsContextResolver,
+							handlerFactory.create(resolversFactory),
+							actions_authorizator,
+						)
+						const actionsWebsocketMiddlewareFactory = new ActionsWebsocketControllerFactory(
+							debugMode,
+							actionsContextResolver,
+							actions_dispatchWorkerSupervisorFactory,
+						)
+						it.addRoute('actions', '/actions/:projectSlug', actionsMiddlewareFactory.create())
+						it.addWebsocketRoute('actions', '/actions/_worker', actionsWebsocketMiddlewareFactory.create())
+					},
+				)
 				.setupService('applicationWorkers', (it, { actions_dispatchWorkerSupervisorFactory, projectGroupContainer, serverConfig }) => {
 					if (!(serverConfig as any).projectGroup) {
 						it.registerWorker(this.name, actions_dispatchWorkerSupervisorFactory.create(projectGroupContainer))
 					}
 				}) as unknown as MasterContainerBuilder
-
 		}
 		return hook
 	}

package/src/migrations/2023-03-10-145000-actions-variables.ts

@@ -11,6 +11,6 @@ const sql = `
     )
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2025-05-28-160000-action-event-user.ts

@@ -11,6 +11,6 @@ ALTER TABLE actions_event
 ADD COLUMN IF NOT EXISTS user_agent TEXT DEFAULT NULL;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/snapshot.ts

@@ -1,6 +1,6 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(`
 		CREATE TYPE ACTIONS_TRIGGER_STATE AS ENUM (
 			'created' ,

package/src/model/EventsToProcessSpecification.ts

@@ -1,11 +1,12 @@
 import { Operator, SelectBuilderSpecification } from '@contember/database'
 
+export const eventsToProcessStateSpecification: SelectBuilderSpecification = qb =>
+	qb
+		.where(it => it.in('state', ['retrying', 'created', 'processing']))
 
-export const eventsToProcessStateSpecification: SelectBuilderSpecification = qb => qb
-	.where(it => it.in('state', ['retrying', 'created', 'processing']))
-
-export const eventsToProcessSpecification: SelectBuilderSpecification = qb => qb
-	.match(eventsToProcessStateSpecification)
-	.where(it => it.compare('visible_at', Operator.lte, 'now'))
-	.orderBy('priority', 'desc')
-	.orderBy('visible_at')
+export const eventsToProcessSpecification: SelectBuilderSpecification = qb =>
+	qb
+		.match(eventsToProcessStateSpecification)
+		.where(it => it.compare('visible_at', Operator.lte, 'now'))
+		.orderBy('priority', 'desc')
+		.orderBy('visible_at')

package/src/model/SetVariableCommand.ts

@@ -2,7 +2,6 @@ import { Command } from '@contember/engine-system-api'
 import { ConflictActionType, InsertBuilder, Literal } from '@contember/database'
 
 export class SetVariableCommand implements Command<void> {
-
 	constructor(
 		private readonly name: string,
 		private readonly value: string,

package/src/triggers/TriggerHandler.ts

@@ -95,7 +95,6 @@ export class TriggerHandler {
 		}))
 	}
 
-
 	/**
 	 * Collect affected triggers after entity was created or before it was deleted.
 	 * todo: after insert, it should probably check only owning relations, because other relations are connected later, so it would be always empty
@@ -103,9 +102,11 @@ export class TriggerHandler {
 	private async indirectChangesEntityHandler(event: BeforeDeleteEvent | AfterInsertEvent) {
 		//
 		const indirectEntityListeners = this.listenersStore.getIndirectListeners(event.entity.name)
-		const promises = indirectEntityListeners.map(listener => this.collectDeepChanges(event, listener, {
-			[event.entity.primary]: { eq: event.id },
-		}))
+		const promises = indirectEntityListeners.map(listener =>
+			this.collectDeepChanges(event, listener, {
+				[event.entity.primary]: { eq: event.id },
+			})
+		)
 		await Promise.all(promises)
 	}
 
@@ -142,7 +143,6 @@ export class TriggerHandler {
 		await Promise.all(promises)
 	}
 
-
 	private async collectDeepChanges(
 		cause: EventCause,
 		listener: IndirectListener | JunctionListener,

package/src/triggers/TriggerListeners.ts

@@ -1,10 +1,4 @@
-import {
-	CreateListener,
-	DeleteListener,
-	IndirectListener,
-	JunctionListener,
-	UpdateListener,
-} from './TriggerListenersStore'
+import { CreateListener, DeleteListener, IndirectListener, JunctionListener, UpdateListener } from './TriggerListenersStore'
 
 export interface TriggerListeners {
 	readonly deleteListeners: Map<string, DeleteListener[]>
@@ -13,4 +7,3 @@ export interface TriggerListeners {
 	readonly indirectListeners: Map<string, IndirectListener[]>
 	readonly junctionListeners: Map<string, Map<string, JunctionListener[]>>
 }
-

package/src/triggers/TriggerListenersBuilder.ts

@@ -6,7 +6,6 @@ import { mapGetOrPut } from '../utils/map'
 import { ImplementationException } from '../ImplementationException'
 
 export class TriggerListenerBuilder {
-
 	private readonly data: TriggerListeners = {
 		createListeners: new Map(),
 		updateListeners: new Map(),
@@ -26,7 +25,7 @@ export class TriggerListenerBuilder {
 		} else if (trigger.type === 'watch') {
 			this.processIndirectListeners(trigger)
 		} else {
-			((_: never) => {
+			;((_: never) => {
 				throw new ImplementationException(`Unhandled trigger ${(trigger as any).type}`)
 			})(trigger)
 		}
@@ -169,12 +168,10 @@ export class TriggerListenerBuilder {
 		return new TriggerListenersStore(this.data)
 	}
 
-
 	private addListener<
 		K extends Exclude<keyof TriggerListeners, 'junctionListeners'>,
-		V extends TriggerListeners[K] extends Map<string, infer V extends any[]> ? V[number] : never
-	>
-	(
+		V extends TriggerListeners[K] extends Map<string, infer V extends any[]> ? V[number] : never,
+	>(
 		type: K,
 		entityName: string,
 		value: V,

package/src/triggers/TriggerPayloadBuilder.ts

@@ -23,7 +23,10 @@ export class TriggerPayloadBuilder {
 		const selections = await this.fetchSelection(filteredEvents)
 		const triggerType = filteredEvents[0].listener.trigger.type
 		if (triggerType === 'basic') {
-			return filteredEvents.map(it => ({ trigger: it.listener.trigger.name, ...this.buildBaseEventPayloads(it, it.selection ?? selections[it.primary]) }))
+			return filteredEvents.map(it => ({
+				trigger: it.listener.trigger.name,
+				...this.buildBaseEventPayloads(it, it.selection ?? selections[it.primary]),
+			}))
 		}
 		if (triggerType === 'watch') {
 			return this.buildWatchEventPayloads(filteredEvents, selections)
@@ -35,9 +38,13 @@ export class TriggerPayloadBuilder {
 		if (event.listener.type === 'delete' && event.listener.trigger.selection) {
 			const input = this.convertSelectionNode(event.listener.trigger.selection)
 
-			const selection = await this.mapper.selectUnique(event.entity, input.withArg('by', {
-				[event.entity.primary]: event.primary,
-			}), [])
+			const selection = await this.mapper.selectUnique(
+				event.entity,
+				input.withArg('by', {
+					[event.entity.primary]: event.primary,
+				}),
+				[],
+			)
 			return { ...event, selection }
 		}
 		return event
@@ -152,14 +159,20 @@ export class TriggerPayloadBuilder {
 		return await this.mapper.selectAssoc(entity, input, [], entity.primary)
 	}
 
-
 	private convertSelectionNode(node: Actions.SelectionNode, nodeName = 'root', path: string[] = []): ObjectNode<Input.ListQueryInput> {
-		return new ObjectNode(nodeName, nodeName, node.map(it => {
-			const [field, args, selection] = Array.isArray(it) ? it : [it, undefined, undefined]
-			if (selection === undefined || selection.length === 0) {
-				return new FieldNode(field, field, {})
-			}
-			return this.convertSelectionNode(selection, field, [...path, nodeName]).withArgs(args)
-		}), {}, {}, path)
+		return new ObjectNode(
+			nodeName,
+			nodeName,
+			node.map(it => {
+				const [field, args, selection] = Array.isArray(it) ? it : [it, undefined, undefined]
+				if (selection === undefined || selection.length === 0) {
+					return new FieldNode(field, field, {})
+				}
+				return this.convertSelectionNode(selection, field, [...path, nodeName]).withArgs(args)
+			}),
+			{},
+			{},
+			path,
+		)
 	}
 }

package/src/triggers/TriggerPayloadManager.ts

@@ -4,7 +4,6 @@ import { EventCause } from './TriggerHandler'
 import { TriggerPayloadBuilder } from './TriggerPayloadBuilder'
 import { TriggerPayloadPersister } from './TriggerPayloadPersister'
 
-
 export interface FiredEvent {
 	listener: AnyListener
 	cause: EventCause
@@ -29,7 +28,6 @@ export class TriggerPayloadManager {
 		this.eventsByTrigger[firedEvent.listener.trigger.name].push(event)
 	}
 
-
 	public async persist(): Promise<void> {
 		for (const events of Object.values(this.eventsByTrigger)) {
 			const payloads = await this.triggerPayloadBuilder.build(events)
@@ -38,4 +36,3 @@ export class TriggerPayloadManager {
 		}
 	}
 }
-

package/src/triggers/TriggerPayloadPersister.ts

@@ -4,7 +4,6 @@ import { Actions, ActionsPayload } from '@contember/schema'
 import { EventRow } from '../model/types'
 import { notify } from '../utils/notifyChannel'
 
-
 type EventRowToInsert = Omit<EventRow, 'created_at' | 'visible_at' | 'last_state_change' | 'log'> & {
 	created_at: string | Date
 	visible_at: string | Date