wip: type alias

Julusian · Julusian · commit a88df0d2fcde · 2024-10-29T17:34:48.000Z
diff --git a/meteor/server/lib/customPublication/index.ts b/meteor/server/lib/customPublication/index.ts
@@ -1,5 +1,5 @@
 export { CustomPublishCollection } from './customPublishCollection'
 export { setUpOptimizedObserverArray } from './optimizedObserverArray'
-export { TriggerUpdate } from './optimizedObserverBase'
+export { TriggerUpdate, SetupObserversResult } from './optimizedObserverBase'
 export { setUpCollectionOptimizedObserver } from './optimizedObserverCollection'
 export { meteorCustomPublish, CustomPublish, CustomPublishChanges } from './publish'
diff --git a/meteor/server/lib/customPublication/optimizedObserverArray.ts b/meteor/server/lib/customPublication/optimizedObserverArray.ts
@@ -1,10 +1,9 @@
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { clone, ProtectedString } from '../tempLib'
-import { TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
+import { SetupObserversResult, TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
 import { CustomPublish, CustomPublishChanges } from './publish'
 import { diffObject } from './lib'
-import { LiveQueryHandle } from '../lib'
 
 /**
  * This is an optimization to enable multiple listeners that observes (and manipulates) the same data, to only use one observer and manipulator,
@@ -29,7 +28,7 @@ export async function setUpOptimizedObserverArray<
 		args: ReadonlyDeep<Args>,
 		/** Trigger an update by mutating the context of manipulateData */
 		triggerUpdate: TriggerUpdate<UpdateProps>
-	) => Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>>,
+	) => Promise<SetupObserversResult>,
 	manipulateData: (
 		args: ReadonlyDeep<Args>,
 		state: Partial<State>,
diff --git a/meteor/server/lib/customPublication/optimizedObserverBase.ts b/meteor/server/lib/customPublication/optimizedObserverBase.ts
@@ -42,6 +42,8 @@ const optimizedObservers: Record<string, OptimizedObserverWrapper<any, unknown,
 
 export type TriggerUpdate<UpdateProps extends Record<string, any>> = (updateProps: Partial<UpdateProps>) => void
 
+export type SetupObserversResult = Array<Promise<LiveQueryHandle> | LiveQueryHandle>
+
 /**
  * This should not be used directly, and should be used through one of the setUpOptimizedObserverArray or setUpCollectionOptimizedObserver wrappers
  *
@@ -66,7 +68,7 @@ export async function setUpOptimizedObserverInner<
 		args: ReadonlyDeep<Args>,
 		/** Trigger an update by mutating the context of manipulateData */
 		triggerUpdate: TriggerUpdate<UpdateProps>
-	) => Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>>,
+	) => Promise<SetupObserversResult>,
 	manipulateData: (
 		args: ReadonlyDeep<Args>,
 		state: Partial<State>,
@@ -187,7 +189,7 @@ async function createOptimizedObserverWorker<
 		args: ReadonlyDeep<Args>,
 		/** Trigger an update by mutating the context of manipulateData */
 		triggerUpdate: TriggerUpdate<UpdateProps>
-	) => Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>>,
+	) => Promise<SetupObserversResult>,
 	manipulateData: (
 		args: ReadonlyDeep<Args>,
 		state: Partial<State>,
diff --git a/meteor/server/lib/customPublication/optimizedObserverCollection.ts b/meteor/server/lib/customPublication/optimizedObserverCollection.ts
@@ -1,8 +1,7 @@
 import { ReadonlyDeep } from 'type-fest'
 import { ProtectedString } from '../tempLib'
-import { LiveQueryHandle } from '../lib'
 import { CustomPublishCollection } from './customPublishCollection'
-import { TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
+import { SetupObserversResult, TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
 import { CustomPublish } from './publish'
 
 /**
@@ -28,7 +27,7 @@ export async function setUpCollectionOptimizedObserver<
 		args: ReadonlyDeep<Args>,
 		/** Trigger an update by mutating the context of manipulateData */
 		triggerUpdate: TriggerUpdate<UpdateProps>
-	) => Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>>,
+	) => Promise<SetupObserversResult>,
 	manipulateData: (
 		args: ReadonlyDeep<Args>,
 		state: Partial<State>,
diff --git a/meteor/server/publications/blueprintUpgradeStatus/publication.ts b/meteor/server/publications/blueprintUpgradeStatus/publication.ts
@@ -7,12 +7,12 @@ import {
 	CustomPublishCollection,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
+	SetupObserversResult,
 	TriggerUpdate,
 } from '../../lib/customPublication'
 import { logger } from '../../logging'
 import { resolveCredentials } from '../../security/lib/credentials'
 import { NoSecurityReadAccess } from '../../security/noSecurity'
-import { LiveQueryHandle } from '../../lib/lib'
 import { ContentCache, createReactiveContentCache, ShowStyleBaseFields, StudioFields } from './reactiveContentCache'
 import { UpgradesContentObserver } from './upgradesContentObserver'
 import { BlueprintMapEntry, checkDocUpgradeStatus } from './checkStatus'
@@ -41,7 +41,7 @@ interface BlueprintUpgradeStatusUpdateProps {
 async function setupBlueprintUpgradeStatusPublicationObservers(
 	_args: ReadonlyDeep<BlueprintUpgradeStatusArgs>,
 	triggerUpdate: TriggerUpdate<BlueprintUpgradeStatusUpdateProps>
-): Promise<LiveQueryHandle[]> {
+): Promise<SetupObserversResult> {
 	// TODO - can this be done cheaper?
 	const cache = createReactiveContentCache()
 
diff --git a/meteor/server/publications/deviceTriggersPreview.ts b/meteor/server/publications/deviceTriggersPreview.ts
@@ -7,7 +7,7 @@ import { ReadonlyDeep } from 'type-fest'
 import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { DeviceTriggerArguments, UIDeviceTriggerPreview } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 import { getCurrentTime } from '../lib/lib'
-import { setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
+import { SetupObserversResult, setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
 import { CustomPublish, meteorCustomPublish } from '../lib/customPublication/publish'
 import { StudioReadAccess } from '../security/studio'
 import { PeripheralDevices } from '../collections'
@@ -73,7 +73,7 @@ function prepareTriggerBufferForStudio(studioId: string) {
 async function setupDeviceTriggersPreviewsObservers(
 	args: ReadonlyDeep<DeviceTriggersPreviewArgs>,
 	triggerUpdate: TriggerUpdate<DeviceTriggersUpdateProps>
-): Promise<Meteor.LiveQueryHandle[]> {
+): Promise<SetupObserversResult> {
 	const studioId = unprotectString(args.studioId)
 	const lastTriggersStudio = prepareTriggerBufferForStudio(studioId)
 
diff --git a/meteor/server/publications/packageManager/expectedPackages/publication.ts b/meteor/server/publications/packageManager/expectedPackages/publication.ts
@@ -6,6 +6,7 @@ import {
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
 	CustomPublishCollection,
+	SetupObserversResult,
 } from '../../../lib/customPublication'
 import { literal, omit, protectString } from '../../../lib/tempLib'
 import { logger } from '../../../logging'
@@ -72,7 +73,7 @@ const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio
 async function setupExpectedPackagesPublicationObservers(
 	args: ReadonlyDeep<ExpectedPackagesPublicationArgs>,
 	triggerUpdate: TriggerUpdate<ExpectedPackagesPublicationUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	const contentCache = createReactiveContentCache()
 
 	// Push update
diff --git a/meteor/server/publications/packageManager/packageContainers.ts b/meteor/server/publications/packageManager/packageContainers.ts
@@ -8,7 +8,12 @@ import { check } from 'meteor/check'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { PeripheralDevices, Studios } from '../../collections'
-import { meteorCustomPublish, setUpOptimizedObserverArray, TriggerUpdate } from '../../lib/customPublication'
+import {
+	meteorCustomPublish,
+	SetupObserversResult,
+	setUpOptimizedObserverArray,
+	TriggerUpdate,
+} from '../../lib/customPublication'
 import { logger } from '../../logging'
 import { PeripheralDeviceReadAccess } from '../../security/peripheralDevice'
 import {
@@ -35,7 +40,7 @@ type PackageManagerPackageContainersState = Record<string, never>
 async function setupExpectedPackagesPublicationObservers(
 	args: ReadonlyDeep<PackageManagerPackageContainersArgs>,
 	triggerUpdate: TriggerUpdate<PackageManagerPackageContainersUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	// Set up observers:
 	return [
 		Studios.observeChanges(
diff --git a/meteor/server/publications/packageManager/playoutContext.ts b/meteor/server/publications/packageManager/playoutContext.ts
@@ -8,7 +8,12 @@ import { check } from 'meteor/check'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { PeripheralDevices, RundownPlaylists, Rundowns } from '../../collections'
-import { meteorCustomPublish, setUpOptimizedObserverArray, TriggerUpdate } from '../../lib/customPublication'
+import {
+	meteorCustomPublish,
+	SetupObserversResult,
+	setUpOptimizedObserverArray,
+	TriggerUpdate,
+} from '../../lib/customPublication'
 import { logger } from '../../logging'
 import { PeripheralDeviceReadAccess } from '../../security/peripheralDevice'
 import {
@@ -36,7 +41,7 @@ type PackageManagerPlayoutContextState = Record<string, never>
 async function setupExpectedPackagesPublicationObservers(
 	args: ReadonlyDeep<PackageManagerPlayoutContextArgs>,
 	triggerUpdate: TriggerUpdate<PackageManagerPlayoutContextUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	// Set up observers:
 	return [
 		RundownPlaylists.observeChanges(
diff --git a/meteor/server/publications/partInstancesUI/publication.ts b/meteor/server/publications/partInstancesUI/publication.ts
@@ -7,6 +7,7 @@ import {
 import { check } from 'meteor/check'
 import {
 	CustomPublishCollection,
+	SetupObserversResult,
 	TriggerUpdate,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
@@ -17,7 +18,6 @@ import { resolveCredentials } from '../../security/lib/credentials'
 import { NoSecurityReadAccess } from '../../security/noSecurity'
 import { ContentCache, PartInstanceOmitedFields, createReactiveContentCache } from './reactiveContentCache'
 import { ReadonlyDeep } from 'type-fest'
-import { LiveQueryHandle } from '../../lib/lib'
 import { RundownPlaylists } from '../../collections'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -65,7 +65,7 @@ const rundownPlaylistFieldSpecifier = literal<
 async function setupUIPartInstancesPublicationObservers(
 	args: ReadonlyDeep<UIPartInstancesArgs>,
 	triggerUpdate: TriggerUpdate<UIPartInstancesUpdateProps>
-): Promise<LiveQueryHandle[]> {
+): Promise<SetupObserversResult> {
 	const playlist = (await RundownPlaylists.findOneAsync(
 		{ activationId: args.playlistActivationId },
 		{
diff --git a/meteor/server/publications/partsUI/publication.ts b/meteor/server/publications/partsUI/publication.ts
@@ -2,6 +2,7 @@ import { PartId, RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/
 import { check } from 'meteor/check'
 import {
 	CustomPublishCollection,
+	SetupObserversResult,
 	TriggerUpdate,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
@@ -14,7 +15,6 @@ import { NoSecurityReadAccess } from '../../security/noSecurity'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { ContentCache, PartOmitedFields, createReactiveContentCache } from './reactiveContentCache'
 import { ReadonlyDeep } from 'type-fest'
-import { LiveQueryHandle } from '../../lib/lib'
 import { RundownPlaylists } from '../../collections'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -53,7 +53,7 @@ const rundownPlaylistFieldSpecifier = literal<
 async function setupUIPartsPublicationObservers(
 	args: ReadonlyDeep<UIPartsArgs>,
 	triggerUpdate: TriggerUpdate<UIPartsUpdateProps>
-): Promise<LiveQueryHandle[]> {
+): Promise<SetupObserversResult> {
 	const playlist = (await RundownPlaylists.findOneAsync(args.playlistId, {
 		projection: rundownPlaylistFieldSpecifier,
 	})) as Pick<DBRundownPlaylist, RundownPlaylistFields> | undefined
diff --git a/meteor/server/publications/peripheralDeviceForDevice.ts b/meteor/server/publications/peripheralDeviceForDevice.ts
@@ -3,7 +3,12 @@ import { PeripheralDeviceReadAccess } from '../security/peripheralDevice'
 import { PeripheralDevice, PeripheralDeviceCategory } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevices, Studios } from '../collections'
-import { TriggerUpdate, meteorCustomPublish, setUpOptimizedObserverArray } from '../lib/customPublication'
+import {
+	SetupObserversResult,
+	TriggerUpdate,
+	meteorCustomPublish,
+	setUpOptimizedObserverArray,
+} from '../lib/customPublication'
 import { PeripheralDeviceForDevice } from '@sofie-automation/shared-lib/dist/core/model/peripheralDevice'
 import { ReadonlyDeep } from 'type-fest'
 import { ReactiveMongoObserverGroup } from './lib/observerGroup'
@@ -120,7 +125,7 @@ export function convertPeripheralDeviceForGateway(
 async function setupPeripheralDevicePublicationObservers(
 	args: ReadonlyDeep<PeripheralDeviceForDeviceArgs>,
 	triggerUpdate: TriggerUpdate<PeripheralDeviceForDeviceUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	const studioObserver = await ReactiveMongoObserverGroup(async () => {
 		const peripheralDeviceCompact = (await PeripheralDevices.findOneAsync(args.deviceId, {
 			fields: { studioId: 1 },
diff --git a/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts b/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts
@@ -18,12 +18,12 @@ import {
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
 	TriggerUpdate,
+	SetupObserversResult,
 } from '../../../lib/customPublication'
 import { logger } from '../../../logging'
 import { resolveCredentials } from '../../../security/lib/credentials'
 import { NoSecurityReadAccess } from '../../../security/noSecurity'
 import { BucketContentCache, createReactiveContentCache } from './bucketContentCache'
-import { LiveQueryHandle } from '../../../lib/lib'
 import { StudioReadAccess } from '../../../security/studio'
 import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import {
@@ -72,7 +72,7 @@ const bucketFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<Bucket,
 async function setupUIBucketContentStatusesPublicationObservers(
 	args: ReadonlyDeep<UIBucketContentStatusesArgs>,
 	triggerUpdate: TriggerUpdate<UIBucketContentStatusesUpdateProps>
-): Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	const trackMediaObjectChange = (mediaId: string): Partial<UIBucketContentStatusesUpdateProps> => ({
 		invalidateMediaObjectMediaId: [mediaId],
 	})
diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts b/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts
@@ -28,6 +28,7 @@ import {
 	CustomPublishCollection,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
+	SetupObserversResult,
 	TriggerUpdate,
 } from '../../../lib/customPublication'
 import { logger } from '../../../logging'
@@ -37,7 +38,6 @@ import { RundownPlaylistReadAccess } from '../../../security/rundownPlaylist'
 import { ContentCache, PartInstanceFields, createReactiveContentCache } from './reactiveContentCache'
 import { RundownContentObserver } from './rundownContentObserver'
 import { RundownsObserver } from '../../lib/rundownsObserver'
-import { LiveQueryHandle } from '../../../lib/lib'
 import {
 	addItemsWithDependenciesChangesToChangedSet,
 	fetchStudio,
@@ -104,7 +104,7 @@ const rundownPlaylistFieldSpecifier = literal<
 async function setupUIPieceContentStatusesPublicationObservers(
 	args: ReadonlyDeep<UIPieceContentStatusesArgs>,
 	triggerUpdate: TriggerUpdate<UIPieceContentStatusesUpdateProps>
-): Promise<Array<Promise<LiveQueryHandle> | LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	const trackMediaObjectChange = (mediaId: string): Partial<UIPieceContentStatusesUpdateProps> => ({
 		invalidateMediaObjectMediaId: [mediaId],
 	})
diff --git a/meteor/server/publications/segmentPartNotesUI/publication.ts b/meteor/server/publications/segmentPartNotesUI/publication.ts
@@ -12,13 +12,13 @@ import {
 	CustomPublishCollection,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
+	SetupObserversResult,
 	TriggerUpdate,
 } from '../../lib/customPublication'
 import { logger } from '../../logging'
 import { resolveCredentials } from '../../security/lib/credentials'
 import { NoSecurityReadAccess } from '../../security/noSecurity'
 import { RundownPlaylistReadAccess } from '../../security/rundownPlaylist'
-import { LiveQueryHandle } from '../../lib/lib'
 import {
 	ContentCache,
 	createReactiveContentCache,
@@ -60,7 +60,7 @@ const rundownPlaylistFieldSpecifier = literal<
 async function setupUISegmentPartNotesPublicationObservers(
 	args: ReadonlyDeep<UISegmentPartNotesArgs>,
 	triggerUpdate: TriggerUpdate<UISegmentPartNotesUpdateProps>
-): Promise<LiveQueryHandle[]> {
+): Promise<SetupObserversResult> {
 	const playlist = (await RundownPlaylists.findOneAsync(args.playlistId, {
 		projection: rundownPlaylistFieldSpecifier,
 	})) as Pick<DBRundownPlaylist, RundownPlaylistFields> | undefined
diff --git a/meteor/server/publications/showStyleUI.ts b/meteor/server/publications/showStyleUI.ts
@@ -1,13 +1,17 @@
 import { ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { Complete, literal } from '../lib/tempLib'
-import { meteorCustomPublish, setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
+import {
+	meteorCustomPublish,
+	SetupObserversResult,
+	setUpOptimizedObserverArray,
+	TriggerUpdate,
+} from '../lib/customPublication'
 import { logger } from '../logging'
 import { NoSecurityReadAccess } from '../security/noSecurity'
 import { OrganizationReadAccess } from '../security/organization'
@@ -38,7 +42,7 @@ const fieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBShowStyleBas
 async function setupUIShowStyleBasePublicationObservers(
 	args: ReadonlyDeep<UIShowStyleBaseArgs>,
 	triggerUpdate: TriggerUpdate<UIShowStyleBaseUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	// Set up observers:
 	return [
 		ShowStyleBases.observeChanges(
diff --git a/meteor/server/publications/studio.ts b/meteor/server/publications/studio.ts
@@ -11,6 +11,7 @@ import { NoSecurityReadAccess } from '../security/noSecurity'
 import {
 	CustomPublish,
 	meteorCustomPublish,
+	SetupObserversResult,
 	setUpOptimizedObserverArray,
 	TriggerUpdate,
 } from '../lib/customPublication'
@@ -170,7 +171,7 @@ interface RoutedMappingsUpdateProps {
 async function setupMappingsPublicationObservers(
 	args: ReadonlyDeep<RoutedMappingsArgs>,
 	triggerUpdate: TriggerUpdate<RoutedMappingsUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	// Set up observers:
 	return [
 		Studios.observeChanges(
diff --git a/meteor/server/publications/studioUI.ts b/meteor/server/publications/studioUI.ts
@@ -1,7 +1,6 @@
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
@@ -11,6 +10,7 @@ import {
 	CustomPublishCollection,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
+	SetupObserversResult,
 	TriggerUpdate,
 } from '../lib/customPublication'
 import { logger } from '../logging'
@@ -62,7 +62,7 @@ const fieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, Stud
 async function setupUIStudioPublicationObservers(
 	args: ReadonlyDeep<UIStudioArgs>,
 	triggerUpdate: TriggerUpdate<UIStudioUpdateProps>
-): Promise<Array<Promise<Meteor.LiveQueryHandle> | Meteor.LiveQueryHandle>> {
+): Promise<SetupObserversResult> {
 	const trackChange = (id: StudioId): Partial<UIStudioUpdateProps> => ({
 		invalidateStudioIds: [id],
 	})
diff --git a/meteor/server/publications/timeline.ts b/meteor/server/publications/timeline.ts
diff --git a/meteor/server/publications/triggeredActionsUI.ts b/meteor/server/publications/triggeredActionsUI.ts
