wip: cleanup

Author: Julusian

meteor/server/api/deviceTriggers/triggersContext.ts

@@ -15,7 +15,7 @@ import { IBaseFilterLink, IRundownPlaylistFilterLink } from '@sofie-automation/b
 import { PartId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DummyReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
 import { ReactivePlaylistActionContext } from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
-import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { FindOneOptions, FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { DBRundownPlaylist, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import {
 	AdLibActions,
@@ -47,16 +47,16 @@ class MeteorTriggersCollectionWrapper<DBInterface extends { _id: ProtectedString
 
 	async findFetchAsync(
 		_computation: TriggerTrackerComputation | null,
-		selector: any,
-		options?: any
+		selector: MongoQuery<DBInterface>,
+		options?: FindOptions<DBInterface>
 	): Promise<Array<DBInterface>> {
 		return this.#collection.findFetchAsync(selector, options)
 	}
 
 	async findOneAsync(
 		_computation: TriggerTrackerComputation | null,
-		selector: any,
-		options?: any
+		selector: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOneOptions<DBInterface>
 	): Promise<DBInterface | undefined> {
 		return this.#collection.findOneAsync(selector, options)
 	}

packages/meteor-lib/src/triggers/actionFactory.ts

@@ -180,7 +180,7 @@ function createAdLibAction(
 
 			const sourceLayerIdsToClear: string[] = []
 
-			// This withComputation is probably not needed, but is a nice safeguard
+			// This withComputation is probably not needed, but it ensures there is no accidental reactivity
 			const wrappedAdLibs = await triggersContext.withComputation(null, async () =>
 				compiledAdLibFilter(innerCtx, null)
 			)

packages/webui/src/client/lib/notifications/notifications.ts

@@ -116,7 +116,7 @@ export class NotifierHandle {
 				this.result = source().get()
 				notificationsDep.changed()
 			})
-		}) as any as Tracker.Computation
+		})
 
 		notifiers[notifierId] = this
 	}

packages/webui/src/client/lib/reactiveData/reactiveDataHelper.ts

@@ -83,7 +83,7 @@ export abstract class WithManagedTracker {
 			const comp = Tracker.autorun(func, options)
 			this._autoruns.push(comp)
 			return comp
-		}) as any as Tracker.Computation
+		})
 	}
 }
 

packages/webui/src/client/lib/triggers/TriggersHandler.tsx

@@ -45,8 +45,7 @@ import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylist
 import { catchError } from '../lib'
 import { logger } from '../logging'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
-import { toTriggersReactiveVar, UiTriggersContext } from './triggersContext'
-import { TriggerTrackerComputation } from '@sofie-automation/meteor-lib/dist/triggers/triggersContext'
+import { toTriggersComputation, toTriggersReactiveVar, UiTriggersContext } from './triggersContext'
 
 type HotkeyTriggerListener = (e: KeyboardEvent) => void
 
@@ -105,7 +104,7 @@ function createAction(
 	)
 	return {
 		preview: async (computation: Tracker.Computation) => {
-			const trackerComputation = computation as any as TriggerTrackerComputation
+			const trackerComputation = toTriggersComputation(computation)
 			const ctx = collectContext(computation)
 			if (!ctx) return []
 

packages/webui/src/client/lib/triggers/triggersContext.ts

@@ -22,10 +22,11 @@ import {
 import { logger } from '../logging'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReactivePlaylistActionContext } from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
-import { MongoReadOnlyCollection } from '../../collections/lib'
+import { FindOneOptions, MongoReadOnlyCollection } from '../../collections/lib'
 import { ProtectedString } from '../tempLib'
 import { ReactiveVar as MeteorReactiveVar } from 'meteor/reactive-var'
 import { TriggerReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
+import { FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 
 class UiTriggersCollectionWrapper<DBInterface extends { _id: ProtectedString<any> }>
 	implements TriggersAsyncCollection<DBInterface>
@@ -38,8 +39,8 @@ class UiTriggersCollectionWrapper<DBInterface extends { _id: ProtectedString<any
 
 	async findFetchAsync(
 		computation: TriggerTrackerComputation | null,
-		selector: any,
-		options?: any
+		selector: MongoQuery<DBInterface>,
+		options?: FindOptions<DBInterface>
 	): Promise<Array<DBInterface>> {
 		return Tracker.withComputation(computation as Tracker.Computation | null, async () => {
 			return this.#collection.find(selector, options).fetch()
@@ -48,8 +49,8 @@ class UiTriggersCollectionWrapper<DBInterface extends { _id: ProtectedString<any
 
 	async findOneAsync(
 		computation: TriggerTrackerComputation | null,
-		selector: any,
-		options?: any
+		selector: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOneOptions<DBInterface>
 	): Promise<DBInterface | undefined> {
 		return Tracker.withComputation(computation as Tracker.Computation | null, async () => {
 			return this.#collection.findOne(selector, options)
@@ -105,3 +106,7 @@ export const UiTriggersContext: TriggersContext = {
 export function toTriggersReactiveVar<T>(reactiveVar: MeteorReactiveVar<T>): TriggerReactiveVar<T> {
 	return reactiveVar as any
 }
+
+export function toTriggersComputation(computation: Tracker.Computation): TriggerTrackerComputation {
+	return computation as any
+}

packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx

@@ -39,9 +39,8 @@ import { isHotkeyTrigger } from '@sofie-automation/meteor-lib/dist/triggers/trig
 import { getAllCurrentAndDeletedItemsFromOverrides, useOverrideOpHelper } from '../../util/OverrideOpHelper'
 import { TriggeredActions } from '../../../../collections'
 import { catchError } from '../../../../lib/lib'
-import { UiTriggersContext } from '../../../../lib/triggers/triggersContext'
+import { toTriggersComputation, UiTriggersContext } from '../../../../lib/triggers/triggersContext'
 import { last, literal } from '@sofie-automation/shared-lib/dist/lib/lib'
-import { TriggerTrackerComputation } from '@sofie-automation/meteor-lib/dist/triggers/triggersContext'
 
 interface IProps {
 	sourceLayers: SourceLayers | undefined
@@ -189,7 +188,7 @@ export const TriggeredActionEntry: React.FC<IProps> = React.memo(function Trigge
 			try {
 				if (!resolvedActions || !selected || !sourceLayers) return []
 
-				const triggerComputation = computation as any as TriggerTrackerComputation
+				const triggerComputation = toTriggersComputation(computation)
 
 				const executableActions = Object.values<SomeAction>(resolvedActions).map((value) =>
 					createAction(UiTriggersContext, value, sourceLayers)