chore: move PieceExtended, PieceUi, IOutputLayerExtended, ISourceLayerExtended interface into core

Author: justandras

packages/corelib/src/dataModel/Piece.ts

@@ -8,6 +8,8 @@ import {
 import { ProtectedString, protectString, unprotectString } from '../protectedString.js'
 import { PieceId, RundownId, SegmentId, PartId } from './Ids.js'
 import { CoreUserEditingDefinition, CoreUserEditingProperties } from './UserEditingDefinitions.js'
+import { IOutputLayerExtended, ISourceLayerExtended } from './ShowStyleBase.js'
+import { PieceInstanceWithTimings } from '../playout/processAndPrune.js'
 
 /** A generic list of playback availability statuses for a Piece */
 export enum PieceStatusCode {
@@ -95,6 +97,30 @@ export interface Piece
 	userEditProperties?: CoreUserEditingProperties
 }
 
+export interface PieceExtended {
+	instance: PieceInstanceWithTimings
+
+	/** Source layer that this piece belongs to */
+	sourceLayer?: ISourceLayerExtended
+	/** Output layer that this part uses */
+	outputLayer?: IOutputLayerExtended
+	/** Position in timeline, relative to the beginning of the Part */
+	renderedInPoint: number | null
+	/** Duration in timeline */
+	renderedDuration: number | null
+	/** If set, the item was cropped in runtime by another item following it */
+	cropped?: boolean
+	/** Maximum width of a label so as not to appear underneath the following item */
+	maxLabelWidth?: number
+	/** If this piece has a "buddy" piece in the preceeding part, then it's not neccessary to display it's left label */
+	hasOriginInPreceedingPart?: boolean
+}
+
+export interface PieceUi extends PieceExtended {
+	/** This item has already been linked to the parent item of the spanning item group */
+	linked?: boolean
+}
+
 export type PieceTimelineObjectsBlob = ProtectedString<'PieceTimelineObjectsBlob'>
 
 export function deserializePieceTimelineObjectsBlob(

packages/corelib/src/dataModel/ShowStyleBase.ts

@@ -2,6 +2,7 @@ import { IBlueprintConfig, IOutputLayer, ISourceLayer, SourceLayerType } from '@
 import { ObjectWithOverrides } from '../settings/objectWithOverrides.js'
 import { BlueprintHash, LastBlueprintConfig } from './Blueprint.js'
 import { BlueprintId, ShowStyleBaseId } from './Ids.js'
+import { PieceExtended } from './Piece.js'
 
 export interface HotkeyDefinition {
 	_id: string
@@ -22,7 +23,19 @@ export interface HotkeyDefinition {
 	down?: (e: any) => void
 }
 
+export interface IOutputLayerExtended extends IOutputLayer {
+	/** Is this output layer used in this segment */
+	used: boolean
+	/** Source layers that will be used by this output layer */
+	sourceLayers: Array<ISourceLayerExtended>
+}
 export type OutputLayers = Record<string, IOutputLayer | undefined>
+export interface ISourceLayerExtended extends ISourceLayer {
+	/** Pieces present on this source layer */
+	pieces: Array<PieceExtended>
+	followingItems: Array<PieceExtended>
+}
+
 export type SourceLayers = Record<string, ISourceLayer | undefined>
 
 export interface DBShowStyleBase {

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

@@ -9,11 +9,11 @@ import {
 	SegmentId,
 	TriggeredActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import type { PieceUi } from '../uiTypes/Piece.js'
 import type { ShelfTabs } from '../uiTypes/ShelfTabs.js'
 import type { IAdLibListItem } from '../uiTypes/Adlib.js'
 import type { BucketAdLibItem } from '../uiTypes/Bucket.js'
 import { Bucket } from '@sofie-automation/corelib/dist/dataModel/Bucket'
+import { PieceUi } from '@sofie-automation/corelib/dist/dataModel/Piece.js'
 
 export enum RundownViewEvents {
 	ACTIVATE_RUNDOWN_PLAYLIST = 'activateRundownPlaylist',

packages/meteor-lib/src/uiTypes/OutputLayer.ts

@@ -1,4 +1,4 @@
-import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { Piece, PieceExtended } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
@@ -25,15 +25,8 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownPlaylistClientUtil } from './rundownPlaylistUtil.js'
 import { PieceInstances, Pieces } from '../collections/index.js'
-
-import { PieceExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
-import { ISourceLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/SourceLayer'
-import { IOutputLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/OutputLayer'
 import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
-
-export type { PieceExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
-export type { ISourceLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/SourceLayer'
-export type { IOutputLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/OutputLayer'
+import { IOutputLayerExtended, ISourceLayerExtended } from '@sofie-automation/corelib/src/dataModel/ShowStyleBase.js'
 
 export interface SegmentExtended extends DBSegment {
 	/** Output layers available in the installation used by this segment */

packages/meteor-lib/src/uiTypes/Piece.ts

@@ -1,5 +1,5 @@
 import _ from 'underscore'
-import { PieceUi, PartUi } from '../ui/SegmentTimeline/SegmentTimelineContainer.js'
+import { PartUi } from '../ui/SegmentTimeline/SegmentTimelineContainer.js'
 import { Timecode } from '@sofie-automation/corelib/dist/index'
 import { Settings } from '../lib/Settings.js'
 import { TFunction } from 'react-i18next'
@@ -15,9 +15,6 @@ import {
 	SegmentExtended,
 	PartExtended,
 	getPieceInstancesForPartInstance,
-	PieceExtended,
-	IOutputLayerExtended,
-	ISourceLayerExtended,
 	PartInstanceLimited,
 	isLoopRunning,
 } from './RundownResolver.js'
@@ -43,12 +40,16 @@ import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-auto
 import { AdLibPieceUi } from './shelf.js'
 import { PartId, PieceId, RundownId, SegmentId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances, Segments } from '../collections/index.js'
-import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { PieceExtended, PieceStatusCode, PieceUi } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { assertNever } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { RundownPlaylistClientUtil } from './rundownPlaylistUtil.js'
-import { UIShowStyleBase } from '@sofie-automation/corelib/src/dataModel/ShowStyleBase.js'
+import {
+	IOutputLayerExtended,
+	ISourceLayerExtended,
+	UIShowStyleBase,
+} from '@sofie-automation/corelib/src/dataModel/ShowStyleBase.js'
 import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
 
 /**

packages/meteor-lib/src/uiTypes/SourceLayer.ts

@@ -1,8 +1,7 @@
 import { PieceLifespan, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { PieceStatusCode, PieceUi } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import classNames from 'classnames'
-import { PieceUi } from '../../ui/SegmentContainer/withResolvedSegment.js'
 import { RundownUtils } from '../rundown.js'
 import { ReadonlyDeep } from 'type-fest'
 import { PieceContentStatusObj } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'

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

@@ -3,7 +3,6 @@ import classNames from 'classnames'
 import { useContext } from 'react'
 import { AreaZoom } from './index.js'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PieceExtended } from '../../../lib/RundownResolver.js'
 import { getAllowSpeaking, getAllowVibrating } from '../../../lib/localStorage.js'
 import { getPartInstanceTimingValue } from '../../../lib/rundownTiming.js'
 import { AutoNextStatus } from '../../RundownView/RundownTiming/AutoNextStatus.js'
@@ -13,6 +12,7 @@ import { PartDisplayDuration } from '../../RundownView/RundownTiming/PartDuratio
 import { TimingDataResolution, TimingTickResolution, useTiming } from '../../RundownView/RundownTiming/withTiming.js'
 import { PartUi } from '../../SegmentContainer/withResolvedSegment.js'
 import { Piece } from './Piece.js'
+import { PieceExtended } from '@sofie-automation/corelib/src/dataModel/Piece.js'
 
 interface IProps {
 	part: PartUi