chore: move PartInstance interface into core

Author: justandras

meteor/__mocks__/defaultCollectionObjects.ts

@@ -10,7 +10,6 @@ import { Piece, EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { getRundownId } from '../server/api/ingest/lib'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import {
 	PartId,
@@ -31,6 +30,7 @@ import {
 	DEFAULT_FALLBACK_PART_DURATION,
 	DEFAULT_MINIMUM_TAKE_SPAN,
 } from '@sofie-automation/shared-lib/dist/core/constants'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioId): DBRundownPlaylist {
 	return {

meteor/server/__tests__/cronjobs.test.ts

@@ -21,7 +21,6 @@ import {
 import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import * as lib from '../lib/lib'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { Meteor } from 'meteor/meteor'
 import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
@@ -76,6 +75,7 @@ import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { Settings } from '../Settings'
 import { SofieIngestCacheType } from '@sofie-automation/corelib/dist/dataModel/SofieIngestDataCache'
 import { ObjectOverrideSetOp, ObjectWithOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 describe('cronjobs', () => {
 	let env: DefaultEnvironment

meteor/server/collections/rundown.ts

@@ -10,11 +10,11 @@ import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataM
 import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
 import { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { createAsyncOnlyReadOnlyMongoCollection } from './collection'
 import { registerIndex } from './indices'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 export const AdLibActions = createAsyncOnlyReadOnlyMongoCollection<AdLibAction>(CollectionName.AdLibActions)
 registerIndex(AdLibActions, {

meteor/server/publications/ingestStatus/reactiveContentCache.ts

@@ -2,11 +2,11 @@ import type { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import type { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
-import type { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import type { NrcsIngestDataCacheObj } from '@sofie-automation/corelib/dist/dataModel/NrcsIngestDataCache'
 import type { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import type { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 export type PlaylistCompact = Pick<
 	DBRundownPlaylist,

meteor/server/publications/segmentPartNotesUI/reactiveContentCache.ts

@@ -4,7 +4,7 @@ import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 export type RundownFields = '_id' | 'playlistId' | 'source'
 export const rundownFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<Rundown, RundownFields>>>({

packages/corelib/src/dataModel/PartInstance.ts

@@ -42,6 +42,10 @@ export interface DBPartInstance {
 	blockTakeUntil?: number
 }
 
+export interface PartInstance extends DBPartInstance {
+	isTemporary: boolean
+}
+
 export interface PartInstanceTimings {
 	/** The playback offset that was set for the last take */
 	playOffset?: Time

packages/meteor-lib/src/api/pubsub.ts

@@ -28,9 +28,9 @@ import {
 import { CorelibPubSub, CorelibPubSubCollections, CorelibPubSubTypes } from '@sofie-automation/corelib/dist/pubsub'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance } from '../collections/PartInstances.js'
 import { UIShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase.js'
 import { UIStudio } from '@sofie-automation/corelib/dist/dataModel/Studio.js'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance.js'
 
 /**
  * Ids of possible DDP subscriptions for the UI only

packages/meteor-lib/src/collections/PartInstances.ts

@@ -1,13 +1,8 @@
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { PartId, RundownPlaylistActivationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
-import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
-
-export interface PartInstance extends DBPartInstance {
-	isTemporary: boolean
-}
-
 export function wrapPartToTemporaryInstance(
 	playlistActivationId: RundownPlaylistActivationId,
 	part: DBPart

packages/webui/src/__mocks__/defaultCollectionObjects.ts

@@ -9,7 +9,6 @@ import { IBlueprintPieceType, PieceLifespan } from '@sofie-automation/blueprints
 import { Piece, EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import {
 	PartId,
@@ -27,6 +26,7 @@ import {
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
+import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance'
 
 export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioId): DBRundownPlaylist {
 	return {

packages/webui/src/client/collections/index.ts

@@ -33,13 +33,13 @@ import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
 import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
+import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
 
 export const AdLibActions = createSyncReadOnlyMongoCollection<AdLibAction>(CollectionName.AdLibActions)