diff --git a/meteor/__mocks__/defaultCollectionObjects.ts b/meteor/__mocks__/defaultCollectionObjects.ts index 0bc1d260dc9..eb3e3518725 100644 --- a/meteor/__mocks__/defaultCollectionObjects.ts +++ b/meteor/__mocks__/defaultCollectionObjects.ts @@ -1,7 +1,7 @@ import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio' import { clone } from '@sofie-automation/corelib/dist/lib' import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/meteor/__mocks__/helpers/database.ts b/meteor/__mocks__/helpers/database.ts index 277b1de8ab8..354ca31966f 100644 --- a/meteor/__mocks__/helpers/database.ts +++ b/meteor/__mocks__/helpers/database.ts @@ -45,7 +45,7 @@ import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece' import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece' import { restartRandomId } from '../random' diff --git a/meteor/server/api/cleanup.ts b/meteor/server/api/cleanup.ts index b56ef583b40..a326e45ad01 100644 --- a/meteor/server/api/cleanup.ts +++ b/meteor/server/api/cleanup.ts @@ -2,7 +2,7 @@ import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protected import { getCurrentTime } from '../lib/lib' import { CollectionCleanupResult } from '@sofie-automation/meteor-lib/dist/api/system' import { MongoQuery } from '@sofie-automation/corelib/dist/mongo' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getActiveRundownPlaylistsInStudioFromDb, getExpiredRemovedPackageInfos, diff --git a/meteor/server/api/deviceTriggers/StudioObserver.ts b/meteor/server/api/deviceTriggers/StudioObserver.ts index c98a154b468..57e99b71a66 100644 --- a/meteor/server/api/deviceTriggers/StudioObserver.ts +++ b/meteor/server/api/deviceTriggers/StudioObserver.ts @@ -10,7 +10,7 @@ import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mo import EventEmitter from 'events' import { Meteor } from 'meteor/meteor' import _ from 'underscore' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { logger } from '../../logging' diff --git a/meteor/server/api/deviceTriggers/__tests__/TagsService.test.ts b/meteor/server/api/deviceTriggers/__tests__/TagsService.test.ts index 1248e391583..bb42dce479e 100644 --- a/meteor/server/api/deviceTriggers/__tests__/TagsService.test.ts +++ b/meteor/server/api/deviceTriggers/__tests__/TagsService.test.ts @@ -9,7 +9,7 @@ import { } from '@sofie-automation/corelib/dist/dataModel/Ids' import { ContentCache } from '../reactiveContentCacheForPieceInstances' import { ReactiveCacheCollection } from '../../../publications/lib/ReactiveCacheCollection' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides' import { literal, normalizeArray } from '@sofie-automation/corelib/dist/lib' diff --git a/meteor/server/api/deviceTriggers/reactiveContentCache.ts b/meteor/server/api/deviceTriggers/reactiveContentCache.ts index 5c01abb7ec4..b8e170c1047 100644 --- a/meteor/server/api/deviceTriggers/reactiveContentCache.ts +++ b/meteor/server/api/deviceTriggers/reactiveContentCache.ts @@ -6,7 +6,7 @@ import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' 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 { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions' diff --git a/meteor/server/api/deviceTriggers/reactiveContentCacheForPieceInstances.ts b/meteor/server/api/deviceTriggers/reactiveContentCacheForPieceInstances.ts index fafba70f46d..2035e70c21e 100644 --- a/meteor/server/api/deviceTriggers/reactiveContentCacheForPieceInstances.ts +++ b/meteor/server/api/deviceTriggers/reactiveContentCacheForPieceInstances.ts @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor' import _ from 'underscore' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { ReactiveCacheCollection } from '../../publications/lib/ReactiveCacheCollection' import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' diff --git a/meteor/server/api/deviceTriggers/triggersContext.ts b/meteor/server/api/deviceTriggers/triggersContext.ts index a93d5da362a..b5e05502a2d 100644 --- a/meteor/server/api/deviceTriggers/triggersContext.ts +++ b/meteor/server/api/deviceTriggers/triggersContext.ts @@ -18,7 +18,10 @@ 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 { FindOneOptions, FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo' -import { DBRundownPlaylist, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + SelectedPartInstance, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { AdLibActions, AdLibPieces, diff --git a/meteor/server/api/evaluations.ts b/meteor/server/api/evaluations.ts index 22ac4689f62..5b7385e50c2 100644 --- a/meteor/server/api/evaluations.ts +++ b/meteor/server/api/evaluations.ts @@ -7,7 +7,7 @@ import { Meteor } from 'meteor/meteor' import _ from 'underscore' import { fetchStudioLight } from '../optimizations' import { sendSlackMessageToWebhook } from './integration/slack' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Evaluations, RundownPlaylists } from '../collections' import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides' import { VerifiedRundownPlaylistForUserAction } from '../security/check' diff --git a/meteor/server/api/rest/v1/ingest.ts b/meteor/server/api/rest/v1/ingest.ts index 016227c4ed5..2db7606c440 100644 --- a/meteor/server/api/rest/v1/ingest.ts +++ b/meteor/server/api/rest/v1/ingest.ts @@ -9,7 +9,7 @@ import { } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { getRundownNrcsName, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest' diff --git a/meteor/server/api/rest/v1/playlists.ts b/meteor/server/api/rest/v1/playlists.ts index cdd3e69174b..15b7e6a9648 100644 --- a/meteor/server/api/rest/v1/playlists.ts +++ b/meteor/server/api/rest/v1/playlists.ts @@ -30,7 +30,7 @@ import { RundownPlaylists, Segments, } from '../../../collections' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ServerClientAPI } from '../../client' import { QueueNextSegmentResult, StudioJobs, TakeNextPartResult } from '@sofie-automation/corelib/dist/worker/studio' import { getCurrentTime } from '../../../lib/lib' diff --git a/meteor/server/api/rest/v1/showstyles.ts b/meteor/server/api/rest/v1/showstyles.ts index 9c434b6ac05..08a98690230 100644 --- a/meteor/server/api/rest/v1/showstyles.ts +++ b/meteor/server/api/rest/v1/showstyles.ts @@ -23,7 +23,7 @@ import { validateAPIBlueprintConfigForShowStyle, } from './typeConversion' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { runUpgradeForShowStyleBase, validateConfigForShowStyleBase } from '../../../migration/upgrades' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' import { assertNever } from '@sofie-automation/corelib/dist/lib' diff --git a/meteor/server/api/rest/v1/studios.ts b/meteor/server/api/rest/v1/studios.ts index be8fd376423..c4325e13e73 100644 --- a/meteor/server/api/rest/v1/studios.ts +++ b/meteor/server/api/rest/v1/studios.ts @@ -10,7 +10,7 @@ import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client' import { PeripheralDevices, RundownPlaylists, Studios } from '../../../collections' import { APIStudioFrom, studioFrom, validateAPIBlueprintConfigForStudio } from './typeConversion' import { runUpgradeForStudio, updateStudioBaseline, validateConfigForStudio } from '../../../migration/upgrades' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ServerClientAPI } from '../../client' import { assertNever, literal } from '@sofie-automation/corelib/dist/lib' import { getCurrentTime } from '../../../lib/lib' diff --git a/meteor/server/api/snapshot.ts b/meteor/server/api/snapshot.ts index ce366e2a8ce..f8ce2160b7c 100644 --- a/meteor/server/api/snapshot.ts +++ b/meteor/server/api/snapshot.ts @@ -43,7 +43,7 @@ import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint' import { IngestRundown, VTContent } from '@sofie-automation/blueprints-integration' import { MongoQuery } from '@sofie-automation/corelib/dist/mongo' import { importIngestRundown } from './ingest/http' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions' import { MethodContext, MethodContextAPI } from './methodContext' diff --git a/meteor/server/api/studio/lib.ts b/meteor/server/api/studio/lib.ts index dc0c161793d..b8e317c2885 100644 --- a/meteor/server/api/studio/lib.ts +++ b/meteor/server/api/studio/lib.ts @@ -1,7 +1,7 @@ import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos' import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { getCurrentTime } from '../../lib/lib' import { ExpectedPackages, PackageInfos, PeripheralDevices, RundownPlaylists } from '../../collections' diff --git a/meteor/server/api/userActions.ts b/meteor/server/api/userActions.ts index ef467b48c60..545ddfb74e2 100644 --- a/meteor/server/api/userActions.ts +++ b/meteor/server/api/userActions.ts @@ -43,7 +43,7 @@ import { import { NrcsIngestDataCache, Parts, Pieces, Rundowns } from '../collections' import { NrcsIngestCacheType } from '@sofie-automation/corelib/dist/dataModel/NrcsIngestDataCache' import { verifyHashedToken } from './singleUseTokens' -import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { runIngestOperation } from './ingest/lib' import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest' import { UserPermissions } from '@sofie-automation/meteor-lib/dist/userPermissions' diff --git a/meteor/server/collections/rundown.ts b/meteor/server/collections/rundown.ts index 270c03c2fa5..13e57177468 100644 --- a/meteor/server/collections/rundown.ts +++ b/meteor/server/collections/rundown.ts @@ -9,7 +9,7 @@ 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 { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/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' diff --git a/meteor/server/cronjobs.ts b/meteor/server/cronjobs.ts index eba5011a248..e45704cbaef 100644 --- a/meteor/server/cronjobs.ts +++ b/meteor/server/cronjobs.ts @@ -26,7 +26,7 @@ import { translateMessage, } from '@sofie-automation/corelib/dist/TranslatableMessage' import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' const lowPrioFcn = (fcn: () => any) => { diff --git a/meteor/server/publications/ingestStatus/reactiveContentCache.ts b/meteor/server/publications/ingestStatus/reactiveContentCache.ts index a755ee4f020..b39974622f4 100644 --- a/meteor/server/publications/ingestStatus/reactiveContentCache.ts +++ b/meteor/server/publications/ingestStatus/reactiveContentCache.ts @@ -6,7 +6,7 @@ import type { PartInstance } from '@sofie-automation/meteor-lib/dist/collections 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 type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' export type PlaylistCompact = Pick< DBRundownPlaylist, diff --git a/meteor/server/publications/lib/quickLoop.ts b/meteor/server/publications/lib/quickLoop.ts index 03e4aae1165..c04b589ccaf 100644 --- a/meteor/server/publications/lib/quickLoop.ts +++ b/meteor/server/publications/lib/quickLoop.ts @@ -3,7 +3,7 @@ import { DBRundownPlaylist, QuickLoopMarker, QuickLoopMarkerType, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' import { MarkerPosition, compareMarkerPositions } from '@sofie-automation/corelib/dist/playout/playlist' import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/meteor/server/publications/packageManager/expectedPackages/contentCache.ts b/meteor/server/publications/packageManager/expectedPackages/contentCache.ts index 4d5a6533ed9..30ed6ec4a29 100644 --- a/meteor/server/publications/packageManager/expectedPackages/contentCache.ts +++ b/meteor/server/publications/packageManager/expectedPackages/contentCache.ts @@ -2,7 +2,7 @@ import { ReactiveCacheCollection } from '../../lib/ReactiveCacheCollection' import { literal } from '@sofie-automation/corelib/dist/lib' import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' export type RundownPlaylistCompact = Pick< diff --git a/meteor/server/publications/packageManager/playoutContext.ts b/meteor/server/publications/packageManager/playoutContext.ts index 99e22143fe5..bb3f5390a11 100644 --- a/meteor/server/publications/packageManager/playoutContext.ts +++ b/meteor/server/publications/packageManager/playoutContext.ts @@ -1,6 +1,6 @@ import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal } from '@sofie-automation/corelib/dist/lib' import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' import { PackageManagerPlayoutContext } from '@sofie-automation/shared-lib/dist/package-manager/publications' diff --git a/meteor/server/publications/partInstancesUI/publication.ts b/meteor/server/publications/partInstancesUI/publication.ts index 5c30cea8a2c..464cc6cb51d 100644 --- a/meteor/server/publications/partInstancesUI/publication.ts +++ b/meteor/server/publications/partInstancesUI/publication.ts @@ -13,7 +13,7 @@ import { ContentCache, PartInstanceOmitedFields, createReactiveContentCache } fr import { ReadonlyDeep } from 'type-fest' import { RundownPlaylists } from '../../collections' import { literal } from '@sofie-automation/corelib/dist/lib' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' import { RundownsObserver } from '../lib/rundownsObserver' import { RundownContentObserver } from './rundownContentObserver' diff --git a/meteor/server/publications/partInstancesUI/reactiveContentCache.ts b/meteor/server/publications/partInstancesUI/reactiveContentCache.ts index 66e1e0658ed..34ce3e25427 100644 --- a/meteor/server/publications/partInstancesUI/reactiveContentCache.ts +++ b/meteor/server/publications/partInstancesUI/reactiveContentCache.ts @@ -2,7 +2,7 @@ import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection' import { literal } from '@sofie-automation/corelib/dist/lib' import { MongoFieldSpecifierOnesStrict, MongoFieldSpecifierZeroes } from '@sofie-automation/corelib/dist/mongo' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBStudio, IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' diff --git a/meteor/server/publications/partsUI/publication.ts b/meteor/server/publications/partsUI/publication.ts index 868956828aa..8474450ecc5 100644 --- a/meteor/server/publications/partsUI/publication.ts +++ b/meteor/server/publications/partsUI/publication.ts @@ -14,7 +14,7 @@ import { ContentCache, PartOmitedFields, createReactiveContentCache } from './re import { ReadonlyDeep } from 'type-fest' import { RundownPlaylists } from '../../collections' import { literal } from '@sofie-automation/corelib/dist/lib' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' import { RundownsObserver } from '../lib/rundownsObserver' import { RundownContentObserver } from './rundownContentObserver' diff --git a/meteor/server/publications/partsUI/reactiveContentCache.ts b/meteor/server/publications/partsUI/reactiveContentCache.ts index 12d9423e8e4..74b34843abb 100644 --- a/meteor/server/publications/partsUI/reactiveContentCache.ts +++ b/meteor/server/publications/partsUI/reactiveContentCache.ts @@ -3,7 +3,7 @@ import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection' import { literal } from '@sofie-automation/corelib/dist/lib' import { MongoFieldSpecifierOnesStrict, MongoFieldSpecifierZeroes } from '@sofie-automation/corelib/dist/mongo' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBStudio, IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio' import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts b/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts index a9b95c71407..f2710d50b3a 100644 --- a/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts +++ b/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts @@ -15,7 +15,7 @@ import { import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo' import { ReadonlyDeep } from 'type-fest' import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MediaObjects, PackageContainerPackageStatuses, diff --git a/meteor/server/publications/rundownPlaylist.ts b/meteor/server/publications/rundownPlaylist.ts index c52efc85d36..582c104934e 100644 --- a/meteor/server/publications/rundownPlaylist.ts +++ b/meteor/server/publications/rundownPlaylist.ts @@ -1,5 +1,5 @@ import { meteorPublish } from './lib/lib' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownPlaylists } from '../collections' import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub' diff --git a/meteor/server/publications/segmentPartNotesUI/publication.ts b/meteor/server/publications/segmentPartNotesUI/publication.ts index 4de954886c1..dff789fadd6 100644 --- a/meteor/server/publications/segmentPartNotesUI/publication.ts +++ b/meteor/server/publications/segmentPartNotesUI/publication.ts @@ -27,7 +27,7 @@ import { } from './reactiveContentCache' import { RundownsObserver } from '../lib/rundownsObserver' import { RundownContentObserver } from './rundownContentObserver' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { generateNotesForSegment } from './generateNotesForSegment' import { RundownPlaylists } from '../../collections' import { check, Match } from 'meteor/check' diff --git a/meteor/server/security/check.ts b/meteor/server/security/check.ts index 2b93e231883..df19d425037 100644 --- a/meteor/server/security/check.ts +++ b/meteor/server/security/check.ts @@ -1,6 +1,6 @@ import { PeripheralDeviceId, RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { Meteor } from 'meteor/meteor' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { assertConnectionHasOneOfPermissions, RequestCredentials } from './auth' import { PeripheralDevices, RundownPlaylists, Rundowns } from '../collections' diff --git a/meteor/server/webmanifest.ts b/meteor/server/webmanifest.ts index 3795941f299..909c5d7a642 100644 --- a/meteor/server/webmanifest.ts +++ b/meteor/server/webmanifest.ts @@ -12,7 +12,7 @@ import { getLocale, getRootSubpath, Translations } from './lib' import { generateTranslation } from '@sofie-automation/corelib/dist/lib' import { ITranslatableMessage } from '@sofie-automation/blueprints-integration' import { interpollateTranslation } from '@sofie-automation/corelib/dist/TranslatableMessage' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getCoreSystemAsync } from './coreSystem/collection' import Koa from 'koa' import KoaRouter from '@koa/router' diff --git a/packages/corelib/src/dataModel/RundownPlaylist/index.ts b/packages/corelib/src/dataModel/RundownPlaylist/index.ts deleted file mode 100644 index 37ddeadb7a2..00000000000 --- a/packages/corelib/src/dataModel/RundownPlaylist/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -// Re-export all types from both files to maintain backward compatibility -export * from './RundownPlaylist.js' -export * from './TTimers.js' diff --git a/packages/corelib/src/playout/__tests__/timings.test.ts b/packages/corelib/src/playout/__tests__/timings.test.ts index 610a81ff012..f4e3c4e7dd1 100644 --- a/packages/corelib/src/playout/__tests__/timings.test.ts +++ b/packages/corelib/src/playout/__tests__/timings.test.ts @@ -1,6 +1,6 @@ import { IBlueprintPieceType } from '@sofie-automation/blueprints-integration' import {} from 'type-fest' -import { RundownHoldState } from '../../dataModel/RundownPlaylist/index.js' +import { RundownHoldState } from '../../dataModel/RundownPlaylist/RundownPlaylist.js' import { literal } from '../../lib.js' import { calculatePartTimings, CalculateTimingsPiece, PartCalculatedTimings } from '../timings.js' diff --git a/packages/corelib/src/playout/timings.ts b/packages/corelib/src/playout/timings.ts index 501ebe10487..8737aedfdad 100644 --- a/packages/corelib/src/playout/timings.ts +++ b/packages/corelib/src/playout/timings.ts @@ -3,7 +3,7 @@ import { DBPartInstance } from '../dataModel/PartInstance.js' import { DBPart } from '../dataModel/Part.js' import { PieceInstance, PieceInstancePiece } from '../dataModel/PieceInstance.js' import { Piece } from '../dataModel/Piece.js' -import { RundownHoldState } from '../dataModel/RundownPlaylist/index.js' +import { RundownHoldState } from '../dataModel/RundownPlaylist/RundownPlaylist.js' import { ReadonlyDeep } from 'type-fest' /** diff --git a/packages/corelib/src/pubsub.ts b/packages/corelib/src/pubsub.ts index 4c320e57207..78afff237a0 100644 --- a/packages/corelib/src/pubsub.ts +++ b/packages/corelib/src/pubsub.ts @@ -7,7 +7,7 @@ import { RundownBaselineAdLibAction } from './dataModel/RundownBaselineAdLibActi import { RundownBaselineAdLibItem } from './dataModel/RundownBaselineAdLibPiece.js' import { DBPartInstance } from './dataModel/PartInstance.js' import { DBRundown } from './dataModel/Rundown.js' -import { DBRundownPlaylist } from './dataModel/RundownPlaylist/index.js' +import { DBRundownPlaylist } from './dataModel/RundownPlaylist/RundownPlaylist.js' import { DBSegment } from './dataModel/Segment.js' import { DBShowStyleBase } from './dataModel/ShowStyleBase.js' import { DBShowStyleVariant } from './dataModel/ShowStyleVariant.js' diff --git a/packages/corelib/src/snapshots.ts b/packages/corelib/src/snapshots.ts index 974cf123303..e9147b97498 100644 --- a/packages/corelib/src/snapshots.ts +++ b/packages/corelib/src/snapshots.ts @@ -12,7 +12,7 @@ import { DBRundown } from './dataModel/Rundown.js' import { RundownBaselineAdLibAction } from './dataModel/RundownBaselineAdLibAction.js' import { RundownBaselineAdLibItem } from './dataModel/RundownBaselineAdLibPiece.js' import { RundownBaselineObj } from './dataModel/RundownBaselineObj.js' -import { DBRundownPlaylist } from './dataModel/RundownPlaylist/index.js' +import { DBRundownPlaylist } from './dataModel/RundownPlaylist/RundownPlaylist.js' import { DBSegment } from './dataModel/Segment.js' import { SofieIngestDataCacheObj } from './dataModel/SofieIngestDataCache.js' import { TimelineComplete } from './dataModel/Timeline.js' diff --git a/packages/corelib/src/worker/studio.ts b/packages/corelib/src/worker/studio.ts index 4b47404ea22..f1a4bd10b10 100644 --- a/packages/corelib/src/worker/studio.ts +++ b/packages/corelib/src/worker/studio.ts @@ -19,7 +19,7 @@ import { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob' import { CoreRundownPlaylistSnapshot } from '../snapshots.js' import { NoteSeverity } from '@sofie-automation/blueprints-integration' import { ITranslatableMessage } from '../TranslatableMessage.js' -import { QuickLoopMarker } from '../dataModel/RundownPlaylist/index.js' +import { QuickLoopMarker } from '../dataModel/RundownPlaylist/RundownPlaylist.js' /** List of all Jobs performed by the Worker related to a certain Studio */ export enum StudioJobs { diff --git a/packages/job-worker/src/__mocks__/collection.ts b/packages/job-worker/src/__mocks__/collection.ts index 065f9ee0980..f1f31853c4f 100644 --- a/packages/job-worker/src/__mocks__/collection.ts +++ b/packages/job-worker/src/__mocks__/collection.ts @@ -17,7 +17,7 @@ import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceIns import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction' import { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' diff --git a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts index c8813447219..439b90bba2c 100644 --- a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts +++ b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts @@ -14,7 +14,7 @@ import { import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio' import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/__mocks__/helpers/snapshot.ts b/packages/job-worker/src/__mocks__/helpers/snapshot.ts index 95b143b6fc2..0e530f4645e 100644 --- a/packages/job-worker/src/__mocks__/helpers/snapshot.ts +++ b/packages/job-worker/src/__mocks__/helpers/snapshot.ts @@ -3,7 +3,7 @@ import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartIns import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { TimelineObjGeneric, TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { clone } from '@sofie-automation/corelib/dist/lib' diff --git a/packages/job-worker/src/__tests__/rundownPlaylist.test.ts b/packages/job-worker/src/__tests__/rundownPlaylist.test.ts index 73e39527151..7c3282afbb1 100644 --- a/packages/job-worker/src/__tests__/rundownPlaylist.test.ts +++ b/packages/job-worker/src/__tests__/rundownPlaylist.test.ts @@ -1,7 +1,7 @@ import { PlaylistTimingType } from '@sofie-automation/blueprints-integration' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { protectString, protectStringArray } from '@sofie-automation/corelib/dist/protectedString' import { ProcessedShowStyleCompound } from '../jobs/index.js' import { ReadonlyDeep } from 'type-fest' diff --git a/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts b/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts index 7bb1aaf9861..72bd63d68d4 100644 --- a/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts +++ b/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts @@ -9,7 +9,7 @@ import { OnSetAsNextContext } from '../context/index.js' import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { PartId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' describe('Test blueprint api context', () => { async function getTestee(setManually = false, rehearsal?: boolean) { diff --git a/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts b/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts index 8ea794c883d..c50bcd1034e 100644 --- a/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts +++ b/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts @@ -9,7 +9,7 @@ import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { PartId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { PlayoutModelImpl } from '../../playout/model/implementation/PlayoutModelImpl.js' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' describe('Test blueprint api context', () => { async function getTestee(rehearsal?: boolean) { diff --git a/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts b/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts index b61faf8c176..cef46d0f029 100644 --- a/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts +++ b/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts @@ -7,7 +7,7 @@ import { JobContext, ProcessedShowStyleCompound } from '../../jobs/index.js' import { mock } from 'jest-mock-extended' import { PartAndPieceInstanceActionService } from '../context/services/PartAndPieceInstanceActionService.js' import { ProcessedShowStyleConfig } from '../config.js' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' describe('Test blueprint api context', () => { async function getTestee(rehearsal?: boolean) { diff --git a/packages/job-worker/src/blueprints/__tests__/context-events.test.ts b/packages/job-worker/src/blueprints/__tests__/context-events.test.ts index 67324f3e72a..f065c427c7f 100644 --- a/packages/job-worker/src/blueprints/__tests__/context-events.test.ts +++ b/packages/job-worker/src/blueprints/__tests__/context-events.test.ts @@ -3,7 +3,7 @@ import { PartEventContext, RundownDataChangedEventContext, RundownTimingEventCon import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getRandomId } from '@sofie-automation/corelib/dist/lib' import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js' diff --git a/packages/job-worker/src/blueprints/context/GetRundownContext.ts b/packages/job-worker/src/blueprints/context/GetRundownContext.ts index 88a4f32effd..a4713ffaf60 100644 --- a/packages/job-worker/src/blueprints/context/GetRundownContext.ts +++ b/packages/job-worker/src/blueprints/context/GetRundownContext.ts @@ -3,7 +3,7 @@ import { ReadonlyDeep } from 'type-fest' import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { getRandomString } from '@sofie-automation/corelib/dist/lib' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { WatchedPackagesHelper } from './watchedPackages.js' import { JobContext, ProcessedShowStyleCompound } from '../../jobs/index.js' import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep' diff --git a/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts b/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts index 1d168e84f88..8f68508581b 100644 --- a/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts +++ b/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts @@ -29,7 +29,7 @@ import { getOrderedPartsAfterPlayhead } from '../../playout/lookahead/util.js' import { convertPartToBlueprints, emitIngestOperation } from './lib.js' import { TTimersService } from './services/TTimersService.js' import type { IPlaylistTTimer } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' -import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' export class OnSetAsNextContext extends ShowStyleUserContext diff --git a/packages/job-worker/src/blueprints/context/OnTakeContext.ts b/packages/job-worker/src/blueprints/context/OnTakeContext.ts index e028b31f1d8..30b40b6137c 100644 --- a/packages/job-worker/src/blueprints/context/OnTakeContext.ts +++ b/packages/job-worker/src/blueprints/context/OnTakeContext.ts @@ -33,7 +33,7 @@ import { getOrderedPartsAfterPlayhead } from '../../playout/lookahead/util.js' import { convertPartToBlueprints, emitIngestOperation } from './lib.js' import type { IPlaylistTTimer } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' import { TTimersService } from './services/TTimersService.js' -import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' export class OnTakeContext extends ShowStyleUserContext implements IOnTakeContext, IEventContext { readonly #tTimersService: TTimersService diff --git a/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts b/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts index c718d6bf516..60b6c11c228 100644 --- a/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts +++ b/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts @@ -8,7 +8,10 @@ import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataMod import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { clone } from '@sofie-automation/corelib/dist/lib' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { ABSessionInfo, DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + ABSessionInfo, + DBRundownPlaylist, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getCurrentTime } from '../../lib/index.js' import { PieceInstance, ResolvedPieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' import { ProcessedStudioConfig, ProcessedShowStyleConfig } from '../config.js' diff --git a/packages/job-worker/src/blueprints/context/RundownActivationContext.ts b/packages/job-worker/src/blueprints/context/RundownActivationContext.ts index 71cd3bab1ea..4c40edab57f 100644 --- a/packages/job-worker/src/blueprints/context/RundownActivationContext.ts +++ b/packages/job-worker/src/blueprints/context/RundownActivationContext.ts @@ -16,7 +16,7 @@ import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { setTimelineDatastoreValue, removeTimelineDatastoreValue } from '../../playout/datastore.js' import { TTimersService } from './services/TTimersService.js' import type { IPlaylistTTimer } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' -import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' export class RundownActivationContext extends RundownEventContext implements IRundownActivationContext { private readonly _playoutModel: PlayoutModel diff --git a/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts b/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts index 6e44cb87710..bc26ea0ee78 100644 --- a/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts +++ b/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts @@ -35,11 +35,8 @@ import { import { EXPECTED_INGEST_TO_PLAYOUT_TIME } from '@sofie-automation/shared-lib/dist/core/constants' import { getCurrentTime } from '../../lib/index.js' import { TTimersService } from './services/TTimersService.js' -import type { - DBRundownPlaylist, - RundownTTimer, - RundownTTimerIndex, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' +import { RundownTTimer, RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import type { IPlaylistTTimer } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' export class SyncIngestUpdateToPartInstanceContext diff --git a/packages/job-worker/src/blueprints/context/adlibActions.ts b/packages/job-worker/src/blueprints/context/adlibActions.ts index 80b4b312448..2ed4a885969 100644 --- a/packages/job-worker/src/blueprints/context/adlibActions.ts +++ b/packages/job-worker/src/blueprints/context/adlibActions.ts @@ -40,7 +40,7 @@ import { getOrderedPartsAfterPlayhead } from '../../playout/lookahead/util.js' import { convertPartToBlueprints, emitIngestOperation } from './lib.js' import { IPlaylistTTimer } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' import { TTimersService } from './services/TTimersService.js' -import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' export class DatastoreActionExecutionContext extends ShowStyleUserContext diff --git a/packages/job-worker/src/blueprints/context/lib.ts b/packages/job-worker/src/blueprints/context/lib.ts index 513ca6bd122..4406de8fc89 100644 --- a/packages/job-worker/src/blueprints/context/lib.ts +++ b/packages/job-worker/src/blueprints/context/lib.ts @@ -55,7 +55,10 @@ import { RundownPlaylistTiming, } from '@sofie-automation/blueprints-integration' import { JobContext, ProcessedShowStyleBase, ProcessedShowStyleVariant } from '../../jobs/index.js' -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import _ from 'underscore' import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { wrapTranslatableMessageFromBlueprints } from '@sofie-automation/corelib/dist/TranslatableMessage' diff --git a/packages/job-worker/src/blueprints/context/services/TTimersService.ts b/packages/job-worker/src/blueprints/context/services/TTimersService.ts index 94933cf5cdb..0353a8f0ada 100644 --- a/packages/job-worker/src/blueprints/context/services/TTimersService.ts +++ b/packages/job-worker/src/blueprints/context/services/TTimersService.ts @@ -3,8 +3,14 @@ import type { RundownTTimerMode, TimerState, } from '@sofie-automation/blueprints-integration/dist/context/tTimersContext' -import type { RundownTTimer, RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' -import { timerStateToDuration, timerStateToZeroTime } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { + RundownTTimer, + RundownTTimerIndex, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' +import { + timerStateToDuration, + timerStateToZeroTime, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import type { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { literal } from '@sofie-automation/corelib/dist/lib' import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts b/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts index 5977eb1449e..acf6550f9eb 100644 --- a/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts +++ b/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts @@ -36,7 +36,7 @@ import { PlayoutPartInstanceModelImpl } from '../../../../playout/model/implemen import { writePartInstancesAndPieceInstances } from '../../../../playout/model/implementation/SavePlayoutModel.js' import { PlayoutPieceInstanceModel } from '../../../../playout/model/PlayoutPieceInstanceModel.js' import { DatabasePersistedModel } from '../../../../modelBase.js' -import { SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import * as PlayoutAdlib from '../../../../playout/adlibUtils.js' type TinnerStopPieces = jest.MockedFunction diff --git a/packages/job-worker/src/blueprints/context/services/__tests__/TTimersService.test.ts b/packages/job-worker/src/blueprints/context/services/__tests__/TTimersService.test.ts index cc02deecbfe..6d66286f8a9 100644 --- a/packages/job-worker/src/blueprints/context/services/__tests__/TTimersService.test.ts +++ b/packages/job-worker/src/blueprints/context/services/__tests__/TTimersService.test.ts @@ -2,8 +2,11 @@ import { useFakeCurrentTime, useRealCurrentTime } from '../../../../__mocks__/time.js' import { TTimersService, PlaylistTTimerImpl } from '../TTimersService.js' import type { PlayoutModel } from '../../../../playout/model/PlayoutModel.js' -import type { RundownTTimer, RundownTTimerIndex } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { + RundownTTimer, + RundownTTimerIndex, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { mock, MockProxy } from 'jest-mock-extended' import type { ReadonlyDeep } from 'type-fest' import type { JobContext } from '../../../../jobs/index.js' diff --git a/packages/job-worker/src/db/collections.ts b/packages/job-worker/src/db/collections.ts index 0d7060e7a09..23b54ebaee2 100644 --- a/packages/job-worker/src/db/collections.ts +++ b/packages/job-worker/src/db/collections.ts @@ -28,7 +28,7 @@ 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 { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' diff --git a/packages/job-worker/src/events/__tests__/externalMessageQueue.test.ts b/packages/job-worker/src/events/__tests__/externalMessageQueue.test.ts index 54b97fb0110..272ea655cf2 100644 --- a/packages/job-worker/src/events/__tests__/externalMessageQueue.test.ts +++ b/packages/job-worker/src/events/__tests__/externalMessageQueue.test.ts @@ -9,7 +9,7 @@ import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/cont import { getCurrentTime } from '../../lib/index.js' import { queueExternalMessages } from '../handle.js' import { setupMockShowStyleCompound } from '../../__mocks__/presetCollections.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getRandomId, omit } from '@sofie-automation/corelib/dist/lib' import { ExternalMessageQueueRunner } from '../ExternalMessageQueue.js' import { InvalidateWorkerDataCache, WorkerDataCacheWrapper } from '../../workers/caches.js' diff --git a/packages/job-worker/src/events/handle.ts b/packages/job-worker/src/events/handle.ts index 10476bfe61b..a45297f3f53 100644 --- a/packages/job-worker/src/events/handle.ts +++ b/packages/job-worker/src/events/handle.ts @@ -12,7 +12,7 @@ import { getRandomId, omit, removeNullyProperties } from '@sofie-automation/core import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError' import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataModel/ExternalMessageQueue' import { ICollection, MongoModifier } from '../db/index.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ExternalMessageQueueObjId } from '@sofie-automation/corelib/dist/dataModel/Ids' async function getBlueprintAndDependencies(context: JobContext, rundown: ReadonlyDeep) { diff --git a/packages/job-worker/src/ingest/__tests__/ingest.test.ts b/packages/job-worker/src/ingest/__tests__/ingest.test.ts index 1e207ac14fa..1c0abc828a2 100644 --- a/packages/job-worker/src/ingest/__tests__/ingest.test.ts +++ b/packages/job-worker/src/ingest/__tests__/ingest.test.ts @@ -19,7 +19,7 @@ import { RundownOrphanedReason, RundownSource, } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment' import { clone, getRandomString, literal } from '@sofie-automation/corelib/dist/lib' import { sortPartsInSortedSegments, sortSegmentsInRundowns } from '@sofie-automation/corelib/dist/playout/playlist' diff --git a/packages/job-worker/src/ingest/__tests__/syncChangesToPartInstance.test.ts b/packages/job-worker/src/ingest/__tests__/syncChangesToPartInstance.test.ts index 6fd99f48620..ce581611713 100644 --- a/packages/job-worker/src/ingest/__tests__/syncChangesToPartInstance.test.ts +++ b/packages/job-worker/src/ingest/__tests__/syncChangesToPartInstance.test.ts @@ -17,7 +17,10 @@ import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { PlayoutModelImpl } from '../../playout/model/implementation/PlayoutModelImpl.js' import { PlaylistTimingType, ShowStyleBlueprintManifest } from '@sofie-automation/blueprints-integration' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + SelectedPartInstance, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlayoutRundownModelImpl } from '../../playout/model/implementation/PlayoutRundownModelImpl.js' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' diff --git a/packages/job-worker/src/ingest/commit.ts b/packages/job-worker/src/ingest/commit.ts index 18c981dc4be..245eac2d80a 100644 --- a/packages/job-worker/src/ingest/commit.ts +++ b/packages/job-worker/src/ingest/commit.ts @@ -21,7 +21,7 @@ import { import { ReadonlyDeep } from 'type-fest' import { IngestDatabasePersistedModel, IngestModel, IngestModelReadonly } from './model/IngestModel.js' import { JobContext } from '../jobs/index.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { runJobWithPlaylistLock, runWithPlayoutModel } from '../playout/lock.js' import { CommitIngestData } from './lock.js' diff --git a/packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts b/packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts index c89d0ac8a6e..79490c208fb 100644 --- a/packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts +++ b/packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts @@ -18,7 +18,7 @@ import { MockJobContext, setupDefaultJobEnvironment } from '../../../__mocks__/c import { setupMockIngestDevice, setupMockShowStyleCompound } from '../../../__mocks__/presetCollections.js' import { fixSnapshot } from '../../../__mocks__/helpers/snapshot.js' import { DBRundown, RundownOrphanedReason, RundownSource } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MongoQuery } from '../../../db/index.js' import { handleRemovedRundown } from '../../ingestRundownJobs.js' import { MOS } from '@sofie-automation/corelib' diff --git a/packages/job-worker/src/playout/__tests__/actions.test.ts b/packages/job-worker/src/playout/__tests__/actions.test.ts index bc381cdd0c9..d3a90d67431 100644 --- a/packages/job-worker/src/playout/__tests__/actions.test.ts +++ b/packages/job-worker/src/playout/__tests__/actions.test.ts @@ -1,5 +1,5 @@ import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment' import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js' diff --git a/packages/job-worker/src/playout/__tests__/infinites.test.ts b/packages/job-worker/src/playout/__tests__/infinites.test.ts index 16b1a381e92..b3198388338 100644 --- a/packages/job-worker/src/playout/__tests__/infinites.test.ts +++ b/packages/job-worker/src/playout/__tests__/infinites.test.ts @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js' import { ReadonlyDeep, SetRequired } from 'type-fest' import { PlayoutModel } from '../model/PlayoutModel.js' diff --git a/packages/job-worker/src/playout/__tests__/lib.ts b/packages/job-worker/src/playout/__tests__/lib.ts index f48d1d3ccb7..d64a134e554 100644 --- a/packages/job-worker/src/playout/__tests__/lib.ts +++ b/packages/job-worker/src/playout/__tests__/lib.ts @@ -1,7 +1,7 @@ import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { sortPartsInSortedSegments } from '@sofie-automation/corelib/dist/playout/playlist' import { JobContext } from '../../jobs/index.js' diff --git a/packages/job-worker/src/playout/__tests__/playout.test.ts b/packages/job-worker/src/playout/__tests__/playout.test.ts index 912b118cc26..ad49430f9ab 100644 --- a/packages/job-worker/src/playout/__tests__/playout.test.ts +++ b/packages/job-worker/src/playout/__tests__/playout.test.ts @@ -22,7 +22,7 @@ import { handleResetRundownPlaylist, } from '../activePlaylistJobs.js' import { getSelectedPartInstances } from './lib.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserErrorMessage } from '@sofie-automation/corelib/dist/error' import * as peripheralDeviceLib from '../../peripheralDevice.js' import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts b/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts index fe4caad1902..adf93459e23 100644 --- a/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts +++ b/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts @@ -8,7 +8,7 @@ import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/cont import { PlayoutSegmentModelImpl } from '../model/implementation/PlayoutSegmentModelImpl.js' import { PlayoutSegmentModel } from '../model/PlayoutSegmentModel.js' import { selectNextPart } from '../selectNextPart.js' -import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' class MockPart { diff --git a/packages/job-worker/src/playout/__tests__/tTimers.test.ts b/packages/job-worker/src/playout/__tests__/tTimers.test.ts index d323e939abd..b59abd5a505 100644 --- a/packages/job-worker/src/playout/__tests__/tTimers.test.ts +++ b/packages/job-worker/src/playout/__tests__/tTimers.test.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ +import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import { useFakeCurrentTime, useRealCurrentTime } from '../../__mocks__/time.js' import { validateTTimerIndex, @@ -10,7 +11,6 @@ import { calculateNextTimeOfDayTarget, createTimeOfDayTTimer, } from '../tTimers.js' -import type { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' describe('tTimers utils', () => { beforeEach(() => { diff --git a/packages/job-worker/src/playout/__tests__/tTimersJobs.test.ts b/packages/job-worker/src/playout/__tests__/tTimersJobs.test.ts index 6704e8255ed..1a53f49261a 100644 --- a/packages/job-worker/src/playout/__tests__/tTimersJobs.test.ts +++ b/packages/job-worker/src/playout/__tests__/tTimersJobs.test.ts @@ -2,7 +2,7 @@ import { setupDefaultJobEnvironment, MockJobContext } from '../../__mocks__/cont import { handleRecalculateTTimerProjections } from '../tTimersJobs.js' import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal } from '@sofie-automation/corelib/dist/lib' describe('tTimersJobs', () => { diff --git a/packages/job-worker/src/playout/__tests__/timeline.test.ts b/packages/job-worker/src/playout/__tests__/timeline.test.ts index 8f40ee2dfa9..88e5462d50d 100644 --- a/packages/job-worker/src/playout/__tests__/timeline.test.ts +++ b/packages/job-worker/src/playout/__tests__/timeline.test.ts @@ -11,7 +11,7 @@ import { } from '../../__mocks__/presetCollections.js' import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js' import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { handleTakeNextPart } from '../take.js' import { handleActivateHold } from '../holdJobs.js' import { handleActivateRundownPlaylist, handleDeactivateRundownPlaylist } from '../activePlaylistJobs.js' diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts index 754ee919940..b326cdeb313 100644 --- a/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts +++ b/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts @@ -7,7 +7,7 @@ import { } from '@sofie-automation/blueprints-integration' import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece' import { PieceInstancePiece, ResolvedPieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { literal } from '@sofie-automation/corelib/dist/lib' import { protectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts index 8cc718ff50c..29b18a72c07 100644 --- a/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts +++ b/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts @@ -1,7 +1,7 @@ import { PartInstanceId, PieceInstanceInfiniteId, PartId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { ABSessionInfo } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { ABSessionInfo } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { clone, getRandomId, omit } from '@sofie-automation/corelib/dist/lib' import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts index 0e416cb2556..6aea1fad529 100644 --- a/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts +++ b/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts @@ -1,5 +1,5 @@ import { ABResolverConfiguration, TSR } from '@sofie-automation/blueprints-integration' -import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { literal } from '@sofie-automation/corelib/dist/lib' import { protectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts b/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts index 6c99b94f854..99f1e2df36c 100644 --- a/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts +++ b/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts @@ -1,6 +1,6 @@ import { OnGenerateTimelineObj, TSR } from '@sofie-automation/blueprints-integration' import { ResolvedPieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import _ from 'underscore' import { SessionRequest } from './abPlaybackResolver.js' diff --git a/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts b/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts index 18df420b073..69c863f436c 100644 --- a/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts +++ b/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts @@ -2,7 +2,7 @@ import { AB_MEDIA_PLAYER_AUTO } from '@sofie-automation/blueprints-integration' import { PartId, PieceInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { ABSessionInfo } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { ABSessionInfo } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { getRandomString, omit } from '@sofie-automation/corelib/dist/lib' import { protectString, unpartialString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/abPlayback/applyAssignments.ts b/packages/job-worker/src/playout/abPlayback/applyAssignments.ts index bb3096488b4..f3682550096 100644 --- a/packages/job-worker/src/playout/abPlayback/applyAssignments.ts +++ b/packages/job-worker/src/playout/abPlayback/applyAssignments.ts @@ -6,7 +6,10 @@ import { ABTimelineLayerChangeRules, AbPlayerId, } from '@sofie-automation/blueprints-integration' -import { ABSessionAssignment, ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + ABSessionAssignment, + ABSessionAssignments, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { logger } from '../../logging.js' import _ from 'underscore' diff --git a/packages/job-worker/src/playout/abPlayback/index.ts b/packages/job-worker/src/playout/abPlayback/index.ts index a4598d260f7..eab0754bd47 100644 --- a/packages/job-worker/src/playout/abPlayback/index.ts +++ b/packages/job-worker/src/playout/abPlayback/index.ts @@ -3,7 +3,7 @@ import { ABSessionAssignment, ABSessionAssignments, DBRundownPlaylist, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline' import { endTrace, sendTrace, startTrace } from '@sofie-automation/corelib/dist/influxdb' import { WrappedShowStyleBlueprint } from '../../blueprints/cache.js' diff --git a/packages/job-worker/src/playout/activePlaylistJobs.ts b/packages/job-worker/src/playout/activePlaylistJobs.ts index 8a5d6bb376f..65e95970b07 100644 --- a/packages/job-worker/src/playout/activePlaylistJobs.ts +++ b/packages/job-worker/src/playout/activePlaylistJobs.ts @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error' import { ActivateRundownPlaylistProps, diff --git a/packages/job-worker/src/playout/adlibAction.ts b/packages/job-worker/src/playout/adlibAction.ts index 66217e8a42a..21c6bbfbf63 100644 --- a/packages/job-worker/src/playout/adlibAction.ts +++ b/packages/job-worker/src/playout/adlibAction.ts @@ -15,7 +15,10 @@ import { runJobWithPlaylistLock } from './lock.js' import { updateTimeline } from './timeline/generate.js' import { performTakeToNextedPart } from './take.js' import { ActionUserData } from '@sofie-automation/blueprints-integration' -import { DBRundownPlaylist, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + SelectedPartInstance, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { logger } from '../logging.js' import { AdLibActionId, diff --git a/packages/job-worker/src/playout/adlibJobs.ts b/packages/job-worker/src/playout/adlibJobs.ts index 0d0bf2e3074..40fdac76b94 100644 --- a/packages/job-worker/src/playout/adlibJobs.ts +++ b/packages/job-worker/src/playout/adlibJobs.ts @@ -1,7 +1,7 @@ import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece' import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece' import { PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { assertNever, clone } from '@sofie-automation/corelib/dist/lib' import { logger } from '../logging.js' import { JobContext, ProcessedShowStyleCompound } from '../jobs/index.js' diff --git a/packages/job-worker/src/playout/adlibUtils.ts b/packages/job-worker/src/playout/adlibUtils.ts index f422efd0d2f..9a54c0d62af 100644 --- a/packages/job-worker/src/playout/adlibUtils.ts +++ b/packages/job-worker/src/playout/adlibUtils.ts @@ -26,7 +26,7 @@ import { ReadonlyDeep } from 'type-fest' import { PlayoutRundownModel } from './model/PlayoutRundownModel.js' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { protectString } from '@sofie-automation/corelib/dist/protectedString' -import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' export async function innerStartOrQueueAdLibPiece( context: JobContext, diff --git a/packages/job-worker/src/playout/bucketAdlibJobs.ts b/packages/job-worker/src/playout/bucketAdlibJobs.ts index 85da8778c22..38ef26cf97e 100644 --- a/packages/job-worker/src/playout/bucketAdlibJobs.ts +++ b/packages/job-worker/src/playout/bucketAdlibJobs.ts @@ -5,7 +5,7 @@ import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/erro import { BucketId, ShowStyleBaseId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { innerStartOrQueueAdLibPiece } from './adlibUtils.js' import { executeAdlibActionAndSaveModel } from './adlibAction.js' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { createPlayoutModelfromInitModel, loadPlayoutModelPreInit } from './model/implementation/LoadPlayoutModel.js' /** diff --git a/packages/job-worker/src/playout/holdJobs.ts b/packages/job-worker/src/playout/holdJobs.ts index cf4f6e651c4..bd10968aa3a 100644 --- a/packages/job-worker/src/playout/holdJobs.ts +++ b/packages/job-worker/src/playout/holdJobs.ts @@ -1,5 +1,5 @@ import { PartHoldMode } from '@sofie-automation/blueprints-integration' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error' import { ActivateHoldProps, DeactivateHoldProps } from '@sofie-automation/corelib/dist/worker/studio' import { JobContext } from '../jobs/index.js' diff --git a/packages/job-worker/src/playout/lock.ts b/packages/job-worker/src/playout/lock.ts index 0dad5256174..94b41fc38f1 100644 --- a/packages/job-worker/src/playout/lock.ts +++ b/packages/job-worker/src/playout/lock.ts @@ -1,5 +1,5 @@ import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownPlayoutPropsBase } from '@sofie-automation/corelib/dist/worker/studio' import { logger } from '../logging.js' import { ReadonlyDeep } from 'type-fest' diff --git a/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts b/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts index a515e2e0b4f..de4b4430fc4 100644 --- a/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts +++ b/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts @@ -11,7 +11,10 @@ import { LookaheadMode, PlaylistTimingType, TSR } from '@sofie-automation/bluepr import { setupDefaultJobEnvironment, MockJobContext } from '../../../__mocks__/context.js' import { runJobWithPlayoutModel } from '../../../playout/lock.js' import { defaultRundownPlaylist } from '../../../__mocks__/defaultCollectionObjects.js' -import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + RundownHoldState, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' jest.mock('../findForLayer') type TfindLookaheadForLayer = jest.MockedFunction diff --git a/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts b/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts index 823e13373e0..28683c1dbea 100644 --- a/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts +++ b/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts @@ -11,7 +11,7 @@ import { defaultRundownPlaylist } from '../../../__mocks__/defaultCollectionObje import _ from 'underscore' import { wrapPartToTemporaryInstance } from '../../../__mocks__/partinstance.js' import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides' -import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' describe('getOrderedPartsAfterPlayhead', () => { diff --git a/packages/job-worker/src/playout/lookahead/index.ts b/packages/job-worker/src/playout/lookahead/index.ts index cfcb8b42801..447bb3352ce 100644 --- a/packages/job-worker/src/playout/lookahead/index.ts +++ b/packages/job-worker/src/playout/lookahead/index.ts @@ -24,7 +24,7 @@ import { LookaheadTimelineObject } from './findObjects.js' import { hasPieceInstanceDefinitelyEnded, TimelinePlayoutState } from '../timeline/lib.js' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { ReadonlyDeep } from 'type-fest' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { filterPieceInstancesForNextPartWithOffset } from './lookaheadOffset.js' const LOOKAHEAD_OBJ_PRIORITY = 0.1 diff --git a/packages/job-worker/src/playout/model/PlayoutModel.ts b/packages/job-worker/src/playout/model/PlayoutModel.ts index f84a098b281..86946144222 100644 --- a/packages/job-worker/src/playout/model/PlayoutModel.ts +++ b/packages/job-worker/src/playout/model/PlayoutModel.ts @@ -17,8 +17,8 @@ import { DBRundownPlaylist, QuickLoopMarker, RundownHoldState, - RundownTTimer, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' +import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import { ReadonlyDeep } from 'type-fest' import { StudioPlayoutModelBase, StudioPlayoutModelBaseReadonly } from '../../studio/model/StudioPlayoutModel.js' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts b/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts index c811d2fdcd9..2bac8edbedf 100644 --- a/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts +++ b/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts @@ -1,5 +1,5 @@ import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DatabasePersistedModel } from '../../../modelBase.js' import { IngestModelReadonly } from '../../../ingest/model/IngestModel.js' import { PlaylistLock } from '../../../jobs/lock.js' diff --git a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts index 25c7754c24f..92c3d74cbbc 100644 --- a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts +++ b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts @@ -16,9 +16,9 @@ import { DBRundownPlaylist, QuickLoopMarker, RundownHoldState, - RundownTTimer, SelectedPartInstance, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' +import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import { ReadonlyDeep } from 'type-fest' import { JobContext } from '../../../jobs/index.js' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/job-worker/src/playout/model/services/QuickLoopService.ts b/packages/job-worker/src/playout/model/services/QuickLoopService.ts index fbf650adb72..3b511c9d862 100644 --- a/packages/job-worker/src/playout/model/services/QuickLoopService.ts +++ b/packages/job-worker/src/playout/model/services/QuickLoopService.ts @@ -4,7 +4,7 @@ import { QuickLoopMarker, QuickLoopMarkerType, QuickLoopProps, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/job-worker/src/playout/quickLoopMarkers.ts b/packages/job-worker/src/playout/quickLoopMarkers.ts index 6989c745717..c35f70ef3e6 100644 --- a/packages/job-worker/src/playout/quickLoopMarkers.ts +++ b/packages/job-worker/src/playout/quickLoopMarkers.ts @@ -6,7 +6,10 @@ import { updateTimeline } from './timeline/generate.js' import { selectNextPart } from './selectNextPart.js' import { setNextPart } from './setNext.js' import { resetPartInstancesWithPieceInstances } from './lib.js' -import { QuickLoopMarker, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + QuickLoopMarker, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { clone } from 'underscore' import { PlayoutModel } from './model/PlayoutModel.js' diff --git a/packages/job-worker/src/playout/selectNextPart.ts b/packages/job-worker/src/playout/selectNextPart.ts index da8184a5ccb..19cc81c4415 100644 --- a/packages/job-worker/src/playout/selectNextPart.ts +++ b/packages/job-worker/src/playout/selectNextPart.ts @@ -1,7 +1,10 @@ import { DBPart, isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part' import { JobContext } from '../jobs/index.js' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { ReadonlyDeep } from 'type-fest' diff --git a/packages/job-worker/src/playout/setNext.ts b/packages/job-worker/src/playout/setNext.ts index 2fb38067aed..39e39fec630 100644 --- a/packages/job-worker/src/playout/setNext.ts +++ b/packages/job-worker/src/playout/setNext.ts @@ -16,7 +16,7 @@ import { PRESERVE_UNSYNCED_PLAYING_SEGMENT_CONTENTS } from '@sofie-automation/sh import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest' import _ from 'underscore' import { resetPartInstancesWithPieceInstances } from './lib.js' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error' import { SelectNextPartResult } from './selectNextPart.js' import { ReadonlyDeep } from 'type-fest' diff --git a/packages/job-worker/src/playout/setNextJobs.ts b/packages/job-worker/src/playout/setNextJobs.ts index f9ce6988de8..4d7ba436692 100644 --- a/packages/job-worker/src/playout/setNextJobs.ts +++ b/packages/job-worker/src/playout/setNextJobs.ts @@ -1,6 +1,6 @@ import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBPart, isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error' import { SetNextPartProps, diff --git a/packages/job-worker/src/playout/snapshot.ts b/packages/job-worker/src/playout/snapshot.ts index 95d9cb3b4d7..8c8a71dee81 100644 --- a/packages/job-worker/src/playout/snapshot.ts +++ b/packages/job-worker/src/playout/snapshot.ts @@ -33,7 +33,7 @@ import { getPartId, getSegmentId } from '../ingest/lib.js' import { assertNever, getHash, getRandomId, literal, omit } from '@sofie-automation/corelib/dist/lib' import { logger } from '../logging.js' import { JSONBlobParse, JSONBlobStringify } from '@sofie-automation/shared-lib/dist/lib/JSONBlob' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { SofieIngestDataCacheObj } from '@sofie-automation/corelib/dist/dataModel/SofieIngestDataCache' import * as PackagesPreR53 from '@sofie-automation/corelib/dist/dataModel/Old/ExpectedPackagesR52' diff --git a/packages/job-worker/src/playout/tTimers.ts b/packages/job-worker/src/playout/tTimers.ts index af410aa460b..18a475d74ee 100644 --- a/packages/job-worker/src/playout/tTimers.ts +++ b/packages/job-worker/src/playout/tTimers.ts @@ -1,4 +1,7 @@ -import type { RundownTTimerIndex, RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { + RundownTTimerIndex, + RundownTTimer, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import type { RundownTTimerMode, TimerState } from '@sofie-automation/blueprints-integration' import { literal } from '@sofie-automation/corelib/dist/lib' import { getCurrentTime } from '../lib/index.js' diff --git a/packages/job-worker/src/playout/take.ts b/packages/job-worker/src/playout/take.ts index 18c1f24ccdf..86e8fe124ff 100644 --- a/packages/job-worker/src/playout/take.ts +++ b/packages/job-worker/src/playout/take.ts @@ -1,6 +1,9 @@ import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { RundownHoldState, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + RundownHoldState, + SelectedPartInstance, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error' import { logger } from '../logging.js' import { JobContext, ProcessedShowStyleCompound } from '../jobs/index.js' diff --git a/packages/job-worker/src/playout/timeline/__tests__/rundown.test.ts b/packages/job-worker/src/playout/timeline/__tests__/rundown.test.ts index 15133e9d57b..d8ceb5dd71b 100644 --- a/packages/job-worker/src/playout/timeline/__tests__/rundown.test.ts +++ b/packages/job-worker/src/playout/timeline/__tests__/rundown.test.ts @@ -1,5 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { DBRundownPlaylist, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + SelectedPartInstance, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { setupDefaultJobEnvironment } from '../../../__mocks__/context.js' import { buildTimelineObjsForRundown, RundownTimelineResult, RundownTimelineTimingContext } from '../rundown.js' import { protectString } from '@sofie-automation/corelib/dist/protectedString' diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts index 7af782d4ee9..5c4bac75627 100644 --- a/packages/job-worker/src/playout/timeline/rundown.ts +++ b/packages/job-worker/src/playout/timeline/rundown.ts @@ -7,7 +7,10 @@ import { } from '@sofie-automation/blueprints-integration' import { PartInstanceId, PieceInstanceId, PieceInstanceInfiniteId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { PieceInstanceInfinite } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + RundownHoldState, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { TimelineObjGroupPart, TimelineObjRundown, diff --git a/packages/job-worker/src/playout/timings/timelineTriggerTime.ts b/packages/job-worker/src/playout/timings/timelineTriggerTime.ts index 399f999e7ad..d7a16567ba2 100644 --- a/packages/job-worker/src/playout/timings/timelineTriggerTime.ts +++ b/packages/job-worker/src/playout/timings/timelineTriggerTime.ts @@ -1,5 +1,5 @@ import { PartInstanceId, PieceInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OnTimelineTriggerTimeProps } from '@sofie-automation/corelib/dist/worker/studio' import { logger } from '../../logging.js' import { JobContext } from '../../jobs/index.js' diff --git a/packages/job-worker/src/rundown.ts b/packages/job-worker/src/rundown.ts index ec50085bb69..2980a4a697a 100644 --- a/packages/job-worker/src/rundown.ts +++ b/packages/job-worker/src/rundown.ts @@ -1,5 +1,5 @@ import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ReadonlyDeep } from 'type-fest' /** Return true if the rundown is allowed to be moved out of that playlist */ diff --git a/packages/job-worker/src/rundownPlaylists.ts b/packages/job-worker/src/rundownPlaylists.ts index 33faf33e29a..894d140cb41 100644 --- a/packages/job-worker/src/rundownPlaylists.ts +++ b/packages/job-worker/src/rundownPlaylists.ts @@ -1,6 +1,9 @@ import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' import { clone, diff --git a/packages/job-worker/src/studio/lib.ts b/packages/job-worker/src/studio/lib.ts index aaa91ffc3bd..5b0351c9b86 100644 --- a/packages/job-worker/src/studio/lib.ts +++ b/packages/job-worker/src/studio/lib.ts @@ -1,5 +1,5 @@ import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { protectString } from '@sofie-automation/corelib/dist/protectedString' import { JobContext } from '../jobs/index.js' diff --git a/packages/job-worker/src/studio/model/StudioPlayoutModel.ts b/packages/job-worker/src/studio/model/StudioPlayoutModel.ts index 788efee63ee..953eafd02f8 100644 --- a/packages/job-worker/src/studio/model/StudioPlayoutModel.ts +++ b/packages/job-worker/src/studio/model/StudioPlayoutModel.ts @@ -1,6 +1,6 @@ import type { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import type { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import type { TimelineComplete, TimelineCompleteGenerationVersions, diff --git a/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts b/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts index 4dba1885ef1..1ae07e92394 100644 --- a/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts +++ b/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts @@ -1,6 +1,6 @@ import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { PeripheralDevice, PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { serializeTimelineBlob, TimelineComplete, diff --git a/packages/live-status-gateway/src/collections/notifications/playlistNotificationsHandler.ts b/packages/live-status-gateway/src/collections/notifications/playlistNotificationsHandler.ts index 5c8d407406c..314c729c52b 100644 --- a/packages/live-status-gateway/src/collections/notifications/playlistNotificationsHandler.ts +++ b/packages/live-status-gateway/src/collections/notifications/playlistNotificationsHandler.ts @@ -1,6 +1,6 @@ import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub' import throttleToNextTick from '@sofie-automation/shared-lib/dist/lib/throttleToNextTick' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' diff --git a/packages/live-status-gateway/src/collections/notifications/rundownNotificationsHandler.ts b/packages/live-status-gateway/src/collections/notifications/rundownNotificationsHandler.ts index 6b253cf2ae8..221895ab1b7 100644 --- a/packages/live-status-gateway/src/collections/notifications/rundownNotificationsHandler.ts +++ b/packages/live-status-gateway/src/collections/notifications/rundownNotificationsHandler.ts @@ -9,7 +9,7 @@ import { CollectionHandlers } from '../../liveStatusServer.js' import { PublicationCollection } from '../../publicationCollection.js' import { DBNotificationObj, DBNotificationTargetRundown } from '@sofie-automation/corelib/dist/dataModel/Notifications' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' const PLAYLIST_KEYS = ['_id', 'rundownIdsInOrder'] as const type Playlist = PickKeys diff --git a/packages/live-status-gateway/src/collections/partHandler.ts b/packages/live-status-gateway/src/collections/partHandler.ts index 0ad89705623..97ccaf80916 100644 --- a/packages/live-status-gateway/src/collections/partHandler.ts +++ b/packages/live-status-gateway/src/collections/partHandler.ts @@ -1,7 +1,7 @@ import { Logger } from 'winston' import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { SelectedPartInstances } from './partInstancesHandler.js' diff --git a/packages/live-status-gateway/src/collections/partInstancesHandler.ts b/packages/live-status-gateway/src/collections/partInstancesHandler.ts index 0089bc13c21..b200e12fb52 100644 --- a/packages/live-status-gateway/src/collections/partInstancesHandler.ts +++ b/packages/live-status-gateway/src/collections/partInstancesHandler.ts @@ -1,7 +1,7 @@ import { Logger } from 'winston' import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import areElementsShallowEqual from '@sofie-automation/shared-lib/dist/lib/isShallowEqual' diff --git a/packages/live-status-gateway/src/collections/pieceContentStatusesHandler.ts b/packages/live-status-gateway/src/collections/pieceContentStatusesHandler.ts index 5fc0969ef68..46c1d456aa8 100644 --- a/packages/live-status-gateway/src/collections/pieceContentStatusesHandler.ts +++ b/packages/live-status-gateway/src/collections/pieceContentStatusesHandler.ts @@ -1,7 +1,7 @@ import { CustomCollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub' import throttleToNextTick from '@sofie-automation/shared-lib/dist/lib/throttleToNextTick' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' diff --git a/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts b/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts index ae584422742..5d2ed60e64a 100644 --- a/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts +++ b/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts @@ -1,7 +1,7 @@ import { Logger } from 'winston' import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import areElementsShallowEqual from '@sofie-automation/shared-lib/dist/lib/isShallowEqual' diff --git a/packages/live-status-gateway/src/collections/playlistHandler.ts b/packages/live-status-gateway/src/collections/playlistHandler.ts index b691caf27fb..131a6f5a7e0 100644 --- a/packages/live-status-gateway/src/collections/playlistHandler.ts +++ b/packages/live-status-gateway/src/collections/playlistHandler.ts @@ -2,7 +2,7 @@ import { Logger } from 'winston' import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' import { CollectionBase } from '../collectionBase.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub' import { CollectionHandlers } from '../liveStatusServer.js' diff --git a/packages/live-status-gateway/src/collections/rundownContentHandlerBase.ts b/packages/live-status-gateway/src/collections/rundownContentHandlerBase.ts index c354ecae1f0..3288aec711a 100644 --- a/packages/live-status-gateway/src/collections/rundownContentHandlerBase.ts +++ b/packages/live-status-gateway/src/collections/rundownContentHandlerBase.ts @@ -3,7 +3,7 @@ import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' import { CorelibPubSubCollections, CorelibPubSubTypes } from '@sofie-automation/corelib/dist/pubsub' import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { CollectionHandlers } from '../liveStatusServer.js' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' import { CollectionDocCheck } from '@sofie-automation/server-core-integration' diff --git a/packages/live-status-gateway/src/collections/rundownHandler.ts b/packages/live-status-gateway/src/collections/rundownHandler.ts index 74f7decdc3c..5d9cdf9092b 100644 --- a/packages/live-status-gateway/src/collections/rundownHandler.ts +++ b/packages/live-status-gateway/src/collections/rundownHandler.ts @@ -1,7 +1,7 @@ import { Logger } from 'winston' import { CoreHandler } from '../coreHandler.js' import { PublicationCollection } from '../publicationCollection.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' diff --git a/packages/live-status-gateway/src/collections/segmentHandler.ts b/packages/live-status-gateway/src/collections/segmentHandler.ts index 53f1b6c9337..09b419d401b 100644 --- a/packages/live-status-gateway/src/collections/segmentHandler.ts +++ b/packages/live-status-gateway/src/collections/segmentHandler.ts @@ -7,7 +7,7 @@ import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/I import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections' import areElementsShallowEqual from '@sofie-automation/shared-lib/dist/lib/isShallowEqual' import { SegmentsHandler } from './segmentsHandler.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub' import { CollectionHandlers } from '../liveStatusServer.js' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' diff --git a/packages/live-status-gateway/src/topics/__tests__/packagesTopic.spec.ts b/packages/live-status-gateway/src/topics/__tests__/packagesTopic.spec.ts index 5045e74e7c0..6a7369fbd61 100644 --- a/packages/live-status-gateway/src/topics/__tests__/packagesTopic.spec.ts +++ b/packages/live-status-gateway/src/topics/__tests__/packagesTopic.spec.ts @@ -3,7 +3,7 @@ import { makeMockHandlers, makeMockLogger, makeMockSubscriber } from './utils.js import { PackagesTopic } from '../packagesTopic.js' import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus' import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PackagesEvent, PackageStatus } from '@sofie-automation/live-status-gateway-api' function makeTestUIPieceContentStatuses(): UIPieceContentStatus[] { diff --git a/packages/live-status-gateway/src/topics/__tests__/utils.ts b/packages/live-status-gateway/src/topics/__tests__/utils.ts index 23b70507c10..612264befd8 100644 --- a/packages/live-status-gateway/src/topics/__tests__/utils.ts +++ b/packages/live-status-gateway/src/topics/__tests__/utils.ts @@ -1,5 +1,5 @@ import { PlaylistTimingType } from '@sofie-automation/blueprints-integration/dist/documents/playlistTiming' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { mock, MockProxy } from 'jest-mock-extended' import { ShowStyleBaseExt } from '../../collections/showStyleBaseHandler.js' diff --git a/packages/live-status-gateway/src/topics/activePiecesTopic.ts b/packages/live-status-gateway/src/topics/activePiecesTopic.ts index c32890427d9..7515e9ee41d 100644 --- a/packages/live-status-gateway/src/topics/activePiecesTopic.ts +++ b/packages/live-status-gateway/src/topics/activePiecesTopic.ts @@ -8,7 +8,7 @@ import { SelectedPieceInstances, PieceInstanceMin } from '../collections/pieceIn import { toPieceStatus } from './helpers/pieceStatus.js' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { CollectionHandlers } from '../liveStatusServer.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' import { ActivePiecesEvent } from '@sofie-automation/live-status-gateway-api' diff --git a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts index aa4b0093292..a356ef513e3 100644 --- a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts +++ b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts @@ -5,7 +5,7 @@ import { DBRundownPlaylist, QuickLoopMarker, QuickLoopMarkerType, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance' import { assertNever, literal } from '@sofie-automation/shared-lib/dist/lib/lib' import { SelectedPartInstances } from '../collections/partInstancesHandler.js' diff --git a/packages/live-status-gateway/src/topics/adLibsTopic.ts b/packages/live-status-gateway/src/topics/adLibsTopic.ts index 9849f9184f7..9acca418663 100644 --- a/packages/live-status-gateway/src/topics/adLibsTopic.ts +++ b/packages/live-status-gateway/src/topics/adLibsTopic.ts @@ -1,6 +1,6 @@ import { Logger } from 'winston' import { WebSocket } from 'ws' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { WebSocketTopicBase, WebSocketTopic } from '../wsHandler.js' import { literal } from '@sofie-automation/corelib/dist/lib' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' diff --git a/packages/live-status-gateway/src/topics/helpers/pieceStatus.ts b/packages/live-status-gateway/src/topics/helpers/pieceStatus.ts index b82099ef4e5..e26d8c50373 100644 --- a/packages/live-status-gateway/src/topics/helpers/pieceStatus.ts +++ b/packages/live-status-gateway/src/topics/helpers/pieceStatus.ts @@ -3,7 +3,7 @@ import type { ShowStyleBaseExt } from '../../collections/showStyleBaseHandler.js import type { PieceInstanceMin } from '../../collections/pieceInstancesHandler.js' import type { AbSessionAssignment, PieceStatus } from '@sofie-automation/live-status-gateway-api' import { clone } from '@sofie-automation/corelib/dist/lib' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import type { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' const _PLAYLIST_AB_SESSION_KEYS = ['assignedAbSessions', 'trackedAbSessions'] as const diff --git a/packages/live-status-gateway/src/topics/packagesTopic.ts b/packages/live-status-gateway/src/topics/packagesTopic.ts index b87202b6318..cbebfe365de 100644 --- a/packages/live-status-gateway/src/topics/packagesTopic.ts +++ b/packages/live-status-gateway/src/topics/packagesTopic.ts @@ -1,6 +1,6 @@ import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece' import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { assertNever } from '@sofie-automation/server-core-integration' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types' diff --git a/packages/live-status-gateway/src/topics/segmentsTopic.ts b/packages/live-status-gateway/src/topics/segmentsTopic.ts index d7171d6af1e..2d10c3386dd 100644 --- a/packages/live-status-gateway/src/topics/segmentsTopic.ts +++ b/packages/live-status-gateway/src/topics/segmentsTopic.ts @@ -1,6 +1,6 @@ import { Logger } from 'winston' import { WebSocket } from 'ws' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { WebSocketTopicBase, WebSocketTopic } from '../wsHandler.js' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { groupByToMap } from '@sofie-automation/corelib/dist/lib' diff --git a/packages/live-status-gateway/src/topics/studioTopic.ts b/packages/live-status-gateway/src/topics/studioTopic.ts index d1f533b8f67..73b224000ef 100644 --- a/packages/live-status-gateway/src/topics/studioTopic.ts +++ b/packages/live-status-gateway/src/topics/studioTopic.ts @@ -2,7 +2,7 @@ import { Logger } from 'winston' import { WebSocket } from 'ws' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal } from '@sofie-automation/shared-lib/dist/lib/lib' import { StudioEvent, PlaylistStatus, PlaylistActivationStatus } from '@sofie-automation/live-status-gateway-api' import { WebSocketTopicBase, WebSocketTopic } from '../wsHandler.js' diff --git a/packages/meteor-lib/src/api/userActions.ts b/packages/meteor-lib/src/api/userActions.ts index 9f4c89afd01..8ced15f220f 100644 --- a/packages/meteor-lib/src/api/userActions.ts +++ b/packages/meteor-lib/src/api/userActions.ts @@ -30,7 +30,7 @@ import { SnapshotId, StudioId, } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' export interface NewUserActionAPI { take( diff --git a/packages/meteor-lib/src/triggers/actionFactory.ts b/packages/meteor-lib/src/triggers/actionFactory.ts index 86ef61684f3..ddc6dc42fc4 100644 --- a/packages/meteor-lib/src/triggers/actionFactory.ts +++ b/packages/meteor-lib/src/triggers/actionFactory.ts @@ -9,7 +9,7 @@ import { Time, } from '@sofie-automation/blueprints-integration' import { TFunction } from 'i18next' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBShowStyleBase, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio' import RundownViewEventBus, { RundownViewEvents } from '../triggers/RundownViewEventBus.js' diff --git a/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts b/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts index 9f8720c49f0..20eee62ebe7 100644 --- a/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts +++ b/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts @@ -13,7 +13,7 @@ import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' 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 { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { MongoQuery } from '@sofie-automation/corelib/dist/mongo' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' diff --git a/packages/meteor-lib/src/triggers/triggersContext.ts b/packages/meteor-lib/src/triggers/triggersContext.ts index 74e19856104..fd2f1e1a83b 100644 --- a/packages/meteor-lib/src/triggers/triggersContext.ts +++ b/packages/meteor-lib/src/triggers/triggersContext.ts @@ -8,7 +8,7 @@ import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' 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 { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { LoggerInstanceFixed } from '@sofie-automation/corelib/dist/logging' diff --git a/packages/webui/src/__mocks__/defaultCollectionObjects.ts b/packages/webui/src/__mocks__/defaultCollectionObjects.ts index 3df301315a4..a0e2e0c7881 100644 --- a/packages/webui/src/__mocks__/defaultCollectionObjects.ts +++ b/packages/webui/src/__mocks__/defaultCollectionObjects.ts @@ -1,7 +1,7 @@ import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio' import { clone } from '@sofie-automation/corelib/dist/lib' import { unprotectString, protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/webui/src/__mocks__/helpers/database.ts b/packages/webui/src/__mocks__/helpers/database.ts index 3fb24b45fc8..cb0ac173669 100644 --- a/packages/webui/src/__mocks__/helpers/database.ts +++ b/packages/webui/src/__mocks__/helpers/database.ts @@ -16,7 +16,7 @@ import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece' import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece' import { restartRandomId } from '../random.js' diff --git a/packages/webui/src/client/collections/index.ts b/packages/webui/src/client/collections/index.ts index ebfcf64197f..4fc53baf60c 100644 --- a/packages/webui/src/client/collections/index.ts +++ b/packages/webui/src/client/collections/index.ts @@ -37,7 +37,7 @@ import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/Part 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 { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications' diff --git a/packages/webui/src/client/collections/rundownPlaylistUtil.ts b/packages/webui/src/client/collections/rundownPlaylistUtil.ts index 2618f3b5b01..4261197e538 100644 --- a/packages/webui/src/client/collections/rundownPlaylistUtil.ts +++ b/packages/webui/src/client/collections/rundownPlaylistUtil.ts @@ -1,6 +1,6 @@ import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { Rundown, DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib' import { sortRundownIDsInPlaylist } from '@sofie-automation/corelib/dist/playout/playlist' import _ from 'underscore' diff --git a/packages/webui/src/client/lib/RundownResolver.ts b/packages/webui/src/client/lib/RundownResolver.ts index 70c7d0e8baf..946a80e0184 100644 --- a/packages/webui/src/client/lib/RundownResolver.ts +++ b/packages/webui/src/client/lib/RundownResolver.ts @@ -12,7 +12,10 @@ import { invalidateAfter } from './invalidatingTime.js' import { groupByToMap } from '@sofie-automation/corelib/dist/lib' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { getCurrentTime } from './systemTime.js' -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { mongoWhereFilter, MongoQuery } from '@sofie-automation/corelib/dist/mongo' import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib' diff --git a/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts b/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts index a7cabd427ea..461a7228a29 100644 --- a/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts +++ b/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts @@ -1,4 +1,7 @@ -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings' import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/webui/src/client/lib/rundown.ts b/packages/webui/src/client/lib/rundown.ts index ea51848ac06..feae0923551 100644 --- a/packages/webui/src/client/lib/rundown.ts +++ b/packages/webui/src/client/lib/rundown.ts @@ -23,7 +23,7 @@ import { } from './RundownResolver.js' import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal, groupByToMap } from '@sofie-automation/corelib/dist/lib' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { getCurrentTime } from './systemTime.js' diff --git a/packages/webui/src/client/lib/rundownLayouts.ts b/packages/webui/src/client/lib/rundownLayouts.ts index 3956d214441..2a8a146172b 100644 --- a/packages/webui/src/client/lib/rundownLayouts.ts +++ b/packages/webui/src/client/lib/rundownLayouts.ts @@ -48,7 +48,7 @@ import { RundownLayoutWithFilters, RundownViewLayout, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal } from '@sofie-automation/corelib/dist/lib' import { getCurrentTime } from './systemTime.js' import { invalidateAt } from './invalidatingTime.js' diff --git a/packages/webui/src/client/lib/rundownPlaylistUtil.ts b/packages/webui/src/client/lib/rundownPlaylistUtil.ts index 363bf841870..5204472eb05 100644 --- a/packages/webui/src/client/lib/rundownPlaylistUtil.ts +++ b/packages/webui/src/client/lib/rundownPlaylistUtil.ts @@ -1,5 +1,5 @@ import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo' import { RundownPlaylistCollectionUtil } from '../collections/rundownPlaylistUtil.js' import { UIPartInstances, UIParts } from '../ui/Collections.js' diff --git a/packages/webui/src/client/lib/rundownTiming.ts b/packages/webui/src/client/lib/rundownTiming.ts index a273b072ed2..657303673ba 100644 --- a/packages/webui/src/client/lib/rundownTiming.ts +++ b/packages/webui/src/client/lib/rundownTiming.ts @@ -18,7 +18,10 @@ import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-auto import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' -import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarkerType, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { objectFromEntries } from '@sofie-automation/shared-lib/dist/lib/lib' import { getCurrentTime } from './systemTime.js' import { Settings } from '../lib/Settings.js' diff --git a/packages/webui/src/client/lib/shelf.ts b/packages/webui/src/client/lib/shelf.ts index ef96500e1fa..e8238a9d627 100644 --- a/packages/webui/src/client/lib/shelf.ts +++ b/packages/webui/src/client/lib/shelf.ts @@ -1,7 +1,7 @@ import _ from 'underscore' import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { createPartCurrentTimes, diff --git a/packages/webui/src/client/lib/tTimerUtils.ts b/packages/webui/src/client/lib/tTimerUtils.ts index 637c8d75e54..159fe415ceb 100644 --- a/packages/webui/src/client/lib/tTimerUtils.ts +++ b/packages/webui/src/client/lib/tTimerUtils.ts @@ -1,4 +1,4 @@ -import { RundownTTimer, timerStateToDuration } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownTTimer, timerStateToDuration } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' /** * Calculate the display diff for a T-Timer. diff --git a/packages/webui/src/client/lib/triggers/TriggersHandler.tsx b/packages/webui/src/client/lib/triggers/TriggersHandler.tsx index dc67786e43b..fa3243fe5f8 100644 --- a/packages/webui/src/client/lib/triggers/TriggersHandler.tsx +++ b/packages/webui/src/client/lib/triggers/TriggersHandler.tsx @@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next' import Sorensen from '@sofie-automation/sorensen' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub' import { useSubscription, useTracker } from '../ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlayoutActions, SomeAction, SomeBlueprintTrigger, TriggerType } from '@sofie-automation/blueprints-integration' import { isPreviewableAction, diff --git a/packages/webui/src/client/ui/AfterBroadcastForm.tsx b/packages/webui/src/client/ui/AfterBroadcastForm.tsx index 9e75e377b6a..f84e77e8e4d 100644 --- a/packages/webui/src/client/ui/AfterBroadcastForm.tsx +++ b/packages/webui/src/client/ui/AfterBroadcastForm.tsx @@ -1,6 +1,6 @@ import React, { useMemo, useState } from 'react' import { Meteor } from 'meteor/meteor' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { TFunction, useTranslation } from 'react-i18next' import { EvaluationBase } from '@sofie-automation/meteor-lib/dist/collections/Evaluations' import { doUserAction, UserAction } from '../lib/clientUserAction.js' diff --git a/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx index 5bfa710d783..7ae3c99aeed 100644 --- a/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx +++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx @@ -2,7 +2,7 @@ import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' import classNames from 'classnames' import { useContext } from 'react' import { AreaZoom } from './index.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceExtended } from '../../../lib/RundownResolver.js' import { getAllowSpeaking, getAllowVibrating } from '../../../lib/localStorage.js' import { getPartInstanceTimingValue } from '../../../lib/rundownTiming.js' diff --git a/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx index 424da5dac73..8220674e512 100644 --- a/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx +++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx @@ -6,7 +6,7 @@ import { Segments } from '../../../collections/index.js' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { Segment as SegmentComponent } from './Segment.js' import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UIShowStyleBases } from '../../Collections.js' import { RundownToShowStyleContext, StudioContext } from './index.js' import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' diff --git a/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx index c93f274242e..f0223bedbe3 100644 --- a/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx +++ b/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx @@ -11,7 +11,7 @@ import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceExtended } from '../../../lib/RundownResolver.js' import { Rundowns } from '../../../collections/index.js' import { useSubscription, useSubscriptionIfEnabled, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData.js' diff --git a/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreen.tsx b/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreen.tsx index 5b9c2c3f978..d5d425e5cba 100644 --- a/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreen.tsx +++ b/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreen.tsx @@ -1,7 +1,10 @@ import ClassNames from 'classnames' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { PartUi } from '../../SegmentTimeline/SegmentTimelineContainer.js' -import { DBRundownPlaylist, ABSessionAssignment } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + ABSessionAssignment, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { useSubscription, diff --git a/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreenTop.tsx b/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreenTop.tsx index 7aec7690fdf..c9927be495d 100644 --- a/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreenTop.tsx +++ b/packages/webui/src/client/ui/ClockView/DirectorScreen/DirectorScreenTop.tsx @@ -6,7 +6,7 @@ import { } from '../../../lib/Components/CounterComponents' import { useTiming } from '../../RundownView/RundownTiming/withTiming' import { getPlaylistTimingDiff } from '../../../lib/rundownTiming' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getCurrentTime } from '../../../lib/systemTime' import { useTranslation } from 'react-i18next' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' diff --git a/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx b/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx index f0cb0a64e1e..7b0b81cd85f 100644 --- a/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx +++ b/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx @@ -1,7 +1,7 @@ import ClassNames from 'classnames' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { PartUi } from '../SegmentTimeline/SegmentTimelineContainer.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { useTiming } from '../RundownView/RundownTiming/withTiming.js' import { diff --git a/packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx b/packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx index ec0ef952a06..1055e42d295 100644 --- a/packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx +++ b/packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx @@ -1,4 +1,4 @@ -import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import { RundownUtils } from '../../lib/rundown' import { calculateTTimerDiff, calculateTTimerOverUnder } from '../../lib/tTimerUtils' import { useTiming } from '../RundownView/RundownTiming/withTiming' diff --git a/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx b/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx index 07cccb5ad05..97af9adca45 100644 --- a/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx +++ b/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx @@ -24,7 +24,7 @@ import { RundownPlaylists, Rundowns, } from '../../collections/index.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString' import { ExpectedPackage } from '@sofie-automation/shared-lib/dist/package-manager/package' import { PartInvalidReason } from '@sofie-automation/corelib/dist/dataModel/Part' diff --git a/packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx b/packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx index fd372b478d7..ff7323b499f 100644 --- a/packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx +++ b/packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { useTiming } from '../RundownView/RundownTiming/withTiming.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownUtils } from '../../lib/rundown.js' import ClassNames from 'classnames' import { getPlaylistTimingDiff } from '../../lib/rundownTiming.js' diff --git a/packages/webui/src/client/ui/Prompter/PrompterView.tsx b/packages/webui/src/client/ui/Prompter/PrompterView.tsx index 0ace8ae3b43..f5442159180 100644 --- a/packages/webui/src/client/ui/Prompter/PrompterView.tsx +++ b/packages/webui/src/client/ui/Prompter/PrompterView.tsx @@ -1,6 +1,6 @@ import React, { createContext, PropsWithChildren, ReactNode, useRef } from 'react' import _ from 'underscore' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import ClassNames from 'classnames' import { Meteor } from 'meteor/meteor' import { parse as queryStringParse } from 'query-string' diff --git a/packages/webui/src/client/ui/RundownList.tsx b/packages/webui/src/client/ui/RundownList.tsx index c78fe71c637..5c79bb03ba4 100644 --- a/packages/webui/src/client/ui/RundownList.tsx +++ b/packages/webui/src/client/ui/RundownList.tsx @@ -1,7 +1,7 @@ import Tooltip from 'rc-tooltip' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub' import { GENESIS_SYSTEM_VERSION } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getHelpMode } from '../lib/localStorage.js' import { literal } from '@sofie-automation/corelib/dist/lib' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' diff --git a/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx b/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx index e7f68343f63..33ff315e918 100644 --- a/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx +++ b/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx @@ -1,5 +1,5 @@ import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { useCurrentTime } from '../../lib/lib.js' export function ActiveProgressBar({ diff --git a/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx b/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx index e71977c7104..d1f4a6ec9d3 100644 --- a/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx +++ b/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx @@ -6,7 +6,7 @@ import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { ActiveProgressBar } from './ActiveProgressBar.js' import { RundownListItem } from './RundownListItem.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { Link } from 'react-router-dom' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' diff --git a/packages/webui/src/client/ui/RundownView.tsx b/packages/webui/src/client/ui/RundownView.tsx index c552e5f363d..67ef7d74e82 100644 --- a/packages/webui/src/client/ui/RundownView.tsx +++ b/packages/webui/src/client/ui/RundownView.tsx @@ -7,7 +7,10 @@ import { Spinner } from '../lib/Spinner.js' import classNames from 'classnames' import * as _ from 'underscore' import { Prompt } from 'react-router-dom' -import { DBRundownPlaylist, QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + QuickLoopMarker, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment' import { StudioRouteSet } from '@sofie-automation/corelib/dist/dataModel/Studio' diff --git a/packages/webui/src/client/ui/RundownView/DataMissing.tsx b/packages/webui/src/client/ui/RundownView/DataMissing.tsx index 0bbd17070de..1b51015a006 100644 --- a/packages/webui/src/client/ui/RundownView/DataMissing.tsx +++ b/packages/webui/src/client/ui/RundownView/DataMissing.tsx @@ -1,6 +1,6 @@ import { useTranslation } from 'react-i18next' import { Route } from 'react-router-dom' -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import type { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import type { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' import type { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' diff --git a/packages/webui/src/client/ui/RundownView/RundownDetachedShelf.tsx b/packages/webui/src/client/ui/RundownView/RundownDetachedShelf.tsx index ff4cbd3cfbf..b2be8c63459 100644 --- a/packages/webui/src/client/ui/RundownView/RundownDetachedShelf.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownDetachedShelf.tsx @@ -1,5 +1,5 @@ import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' diff --git a/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx b/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx index 1ac5232706a..d6eb307b87b 100644 --- a/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx @@ -3,7 +3,7 @@ import Moment from 'react-moment' import { TimingDataResolution, TimingTickResolution, useTiming } from './RundownTiming/withTiming.js' import { RundownUtils } from '../../lib/rundown.js' import { useTranslation } from 'react-i18next' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' interface IProps { diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownContextMenu.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownContextMenu.tsx index 107b813f4f9..7cdf0f7f10c 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownContextMenu.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownContextMenu.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useContext, useEffect, useRef } from 'react' import { useHistory } from 'react-router-dom' import { useTranslation } from 'react-i18next' import Escape from '../../../lib/Escape' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { ContextMenu, MenuItem, ContextMenuTrigger, hideMenu, showMenu } from '@jstarpl/react-contextmenu' import { contextMenuHoldToDisplayTime, useRundownViewEventBusListener } from '../../../lib/lib' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeader.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeader.tsx index 80d6b7f2101..3ee48559433 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeader.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeader.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import ClassNames from 'classnames' import { NavLink } from 'react-router-dom' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { RundownLayoutRundownHeader } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx index d052a131d3b..407054cb14d 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { useTranslation } from 'react-i18next' import { Countdown } from './Countdown' import { useTiming } from '../RundownTiming/withTiming' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx index b895e1e13e0..7f431dd3b0c 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import { useTranslation } from 'react-i18next' import { Countdown } from './Countdown' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx index 148e5c2ee61..25d702b1232 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import { useTranslation } from 'react-i18next' import { Countdown } from './Countdown' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimers.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimers.tsx index 7b7c7e2d72b..573882fdea1 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimers.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimers.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownTTimer } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/TTimers' import { useTiming } from '../RundownTiming/withTiming' import { RundownUtils } from '../../../lib/rundown' import { calculateTTimerDiff, calculateTTimerOverUnder } from '../../../lib/tTimerUtils' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimingDisplay.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimingDisplay.tsx index 2b9ca4ee749..7cb5a3139e9 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimingDisplay.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderTimingDisplay.tsx @@ -1,4 +1,4 @@ -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import { useTranslation } from 'react-i18next' import { useTiming } from '../RundownTiming/withTiming' diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/useRundownPlaylistOperations.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/useRundownPlaylistOperations.tsx index c4d5a3b64db..e42eff32015 100644 --- a/packages/webui/src/client/ui/RundownView/RundownHeader/useRundownPlaylistOperations.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownHeader/useRundownPlaylistOperations.tsx @@ -7,7 +7,7 @@ import { doModalDialog } from '../../../lib/ModalDialog' import { useTranslation } from 'react-i18next' import React, { useContext, useEffect, useMemo } from 'react' import { UserPermissions, UserPermissionsContext } from '../../UserPermissions' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { logger } from '../../../lib/logging' import * as i18next from 'i18next' diff --git a/packages/webui/src/client/ui/RundownView/RundownSorensenContext.tsx b/packages/webui/src/client/ui/RundownView/RundownSorensenContext.tsx index 12b81a19a95..d764a7de51d 100644 --- a/packages/webui/src/client/ui/RundownView/RundownSorensenContext.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownSorensenContext.tsx @@ -1,5 +1,5 @@ import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' import { useContext } from 'react' diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx index 8ed563be98f..7c1c42e2f0d 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx @@ -3,7 +3,7 @@ import Moment from 'react-moment' import { useTiming } from './withTiming.js' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { RundownUtils } from '../../../lib/rundown.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids' diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx index 0966c7af0f8..38652aa98e3 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx @@ -5,7 +5,7 @@ import { getCurrentTime } from '../../../lib/systemTime.js' import { RundownUtils } from '../../../lib/rundown.js' import { useTiming } from './withTiming.js' import ClassNames from 'classnames' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getPlaylistTimingDiff } from '../../../lib/rundownTiming.js' import { isLoopRunning } from '../../../lib/RundownResolver.js' diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx index a4e2739948f..c6b6412222d 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' import Moment from 'react-moment' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownUtils } from '../../../lib/rundown.js' import { getCurrentTime } from '../../../lib/systemTime.js' import ClassNames from 'classnames' diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx index 1e30ab77926..5cc075aa65c 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx @@ -1,6 +1,6 @@ import { useTranslation } from 'react-i18next' import ClassNames from 'classnames' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { LoopingIcon } from '../../../lib/ui/icons/looping.js' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { RundownUtils } from '../../../lib/rundown.js' diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx index 19e627c7eba..3bf261a23d9 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx @@ -2,7 +2,7 @@ import React, { PropsWithChildren } from 'react' import { Meteor } from 'meteor/meteor' import { withTracker } from '../../../lib/ReactMeteorData/react-meteor-data.js' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { RundownTiming, TimeEventArgs } from './RundownTiming.js' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' diff --git a/packages/webui/src/client/ui/RundownView/RundownViewContextProviders.tsx b/packages/webui/src/client/ui/RundownView/RundownViewContextProviders.tsx index 4dea007a6dc..ecc085c1e2a 100644 --- a/packages/webui/src/client/ui/RundownView/RundownViewContextProviders.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownViewContextProviders.tsx @@ -4,7 +4,7 @@ import StudioContext from './StudioContext' import { RundownPlaylistOperationsContextProvider } from './RundownHeader/useRundownPlaylistOperations.js' import { PreviewPopUpContextProvider } from '../PreviewPopUp/PreviewPopUpContext' import { SelectedElementProvider } from './SelectedElementsContext' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Settings } from '../../lib/Settings' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' diff --git a/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx b/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx index 1cf028af813..ce197df4a0a 100644 --- a/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx @@ -3,7 +3,7 @@ import _ from 'underscore' import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' import { SegmentUi } from '../SegmentTimeline/SegmentTimelineContainer.js' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { DashboardPieceButton } from '../Shelf/DashboardPieceButton.js' import { IBlueprintActionTriggerMode, ISourceLayer } from '@sofie-automation/blueprints-integration' diff --git a/packages/webui/src/client/ui/RundownView/RundownViewSubscriptions.ts b/packages/webui/src/client/ui/RundownView/RundownViewSubscriptions.ts index cf8410371fe..6278eb097f9 100644 --- a/packages/webui/src/client/ui/RundownView/RundownViewSubscriptions.ts +++ b/packages/webui/src/client/ui/RundownView/RundownViewSubscriptions.ts @@ -4,7 +4,7 @@ import { useSubscriptions, useTracker, } from '../../lib/ReactMeteorData/react-meteor-data' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub' diff --git a/packages/webui/src/client/ui/RundownView/WarningDisplay.tsx b/packages/webui/src/client/ui/RundownView/WarningDisplay.tsx index da4a811214d..ef8fd4a343c 100644 --- a/packages/webui/src/client/ui/RundownView/WarningDisplay.tsx +++ b/packages/webui/src/client/ui/RundownView/WarningDisplay.tsx @@ -1,4 +1,4 @@ -import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/packages/webui/src/client/ui/RundownView/useQueueMiniShelfAdlib.ts b/packages/webui/src/client/ui/RundownView/useQueueMiniShelfAdlib.ts index 015e5ac8c05..b902aec4884 100644 --- a/packages/webui/src/client/ui/RundownView/useQueueMiniShelfAdlib.ts +++ b/packages/webui/src/client/ui/RundownView/useQueueMiniShelfAdlib.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase' import { NotificationCenter, NoticeLevel, Notification } from '../../lib/notifications/notifications' import { doUserAction, UserAction } from '../../lib/clientUserAction' diff --git a/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx index 6f0204f7207..da138deee1d 100644 --- a/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx +++ b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx @@ -30,7 +30,10 @@ import { motion } from 'motion/react' import { filterSecondarySourceLayers } from '../SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.js' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + RundownHoldState, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part' import { isLoopRunning } from '../../lib/RundownResolver.js' diff --git a/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts b/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts index 7a4c2f0ca08..d89451fdc69 100644 --- a/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts +++ b/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts @@ -1,7 +1,7 @@ import * as React from 'react' import _ from 'underscore' import { ISourceLayer, NoteSeverity, PieceLifespan } from '@sofie-automation/blueprints-integration' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { withTracker } from '../../lib/ReactMeteorData/react-meteor-data.js' import { IOutputLayerExtended, ISourceLayerExtended, PartExtended, SegmentExtended } from '../../lib/RundownResolver.js' import { IContextMenuContext } from '../RundownView.js' diff --git a/packages/webui/src/client/ui/SegmentList/SegmentList.tsx b/packages/webui/src/client/ui/SegmentList/SegmentList.tsx index 4f439e11092..0b196fd0cb9 100644 --- a/packages/webui/src/client/ui/SegmentList/SegmentList.tsx +++ b/packages/webui/src/client/ui/SegmentList/SegmentList.tsx @@ -1,6 +1,9 @@ import React, { ReactNode, useLayoutEffect, useMemo, useRef, useState } from 'react' import classNames from 'classnames' -import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { + DBRundownPlaylist, + RundownHoldState, +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { UIStateStorage } from '../../lib/UIStateStorage.js' import { PartUi, PieceUi, SegmentNoteCounts, SegmentUi } from '../SegmentContainer/withResolvedSegment.js' import { IContextMenuContext } from '../RundownView.js' diff --git a/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx b/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx index 7a791cbe5d9..1822e9152ed 100644 --- a/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx +++ b/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx @@ -10,7 +10,7 @@ import { PartCountdown } from '../RundownView/RundownTiming/PartCountdown.js' import { SegmentDuration } from '../RundownView/RundownTiming/SegmentDuration.js' import { PartId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' import { useTranslation } from 'react-i18next' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IContextMenuContext } from '../RundownView.js' import { NoteSeverity } from '@sofie-automation/blueprints-integration' import { CriticalIconSmall, WarningIconSmall } from '../../lib/ui/icons/notifications.js' diff --git a/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx index f92fbd94d99..a51d305686a 100644 --- a/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx +++ b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react' import { NoteSeverity } from '@sofie-automation/blueprints-integration' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IContextMenuContext } from '../RundownView.js' import { IOutputLayerUi, @@ -43,7 +43,7 @@ import { ErrorBoundary } from '../../lib/ErrorBoundary.js' import { SwitchViewModeButton } from '../SegmentContainer/SwitchViewModeButton.js' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' import { PartId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentTimeAnchorTime } from '../RundownView/RundownTiming/SegmentTimeAnchorTime.js' import * as RundownResolver from '../../lib/RundownResolver.js' import { logger } from '../../lib/logging.js' diff --git a/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx index b6bba904c1f..7fd3719028e 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ISourceLayerExtended } from '../../../lib/RundownResolver.js' import { IContextMenuContext } from '../../RundownView.js' import { IOutputLayerUi, PartUi, PieceUi, SegmentUi } from '../SegmentTimelineContainer.js' diff --git a/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx index a3e12c01d03..4bc454661b3 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx @@ -3,7 +3,7 @@ import _ from 'underscore' import { withTranslation, WithTranslation, TFunction } from 'react-i18next' import ClassNames from 'classnames' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentUi, PartUi, IOutputLayerUi, PieceUi } from '../SegmentTimelineContainer.js' import { TimingDataResolution, diff --git a/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx index e93de6ff074..82507857f29 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx @@ -1,6 +1,6 @@ import React, { MouseEventHandler, useCallback, useContext, useState } from 'react' import _ from 'underscore' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { literal } from '@sofie-automation/corelib/dist/lib' import { protectString, unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions.js' diff --git a/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx index 58137b19fb5..09d6a76f745 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx @@ -7,7 +7,7 @@ import { DBRundownPlaylist, QuickLoopMarker, QuickLoopMarkerType, -} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { RundownUtils } from '../../lib/rundown.js' import { IContextMenuContext } from '../RundownView.js' import { PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' diff --git a/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx index 56d2422c61d..3d594d71087 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx @@ -4,7 +4,7 @@ import { WithTranslation, withTranslation } from 'react-i18next' import ClassNames from 'classnames' import { ContextMenuTrigger } from '@jstarpl/react-contextmenu' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentUi, PartUi, IOutputLayerUi, PieceUi } from './SegmentTimelineContainer.js' import { TimelineGrid } from './TimelineGrid.js' import { SegmentTimelinePart, SegmentTimelinePartClass } from './Parts/SegmentTimelinePart.js' @@ -43,7 +43,7 @@ import { SegmentViewMode } from '../SegmentContainer/SegmentViewModes.js' import { SwitchViewModeButton } from '../SegmentContainer/SwitchViewModeButton.js' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentNoteCounts } from '../SegmentContainer/withResolvedSegment.js' import { PartExtended } from '../../lib/RundownResolver.js' import { diff --git a/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx index 06fdd01b28c..afb3bc2c822 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx @@ -1,6 +1,6 @@ import { useState, useLayoutEffect } from 'react' import { useTranslation } from 'react-i18next' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { RundownUtils } from '../../../lib/rundown.js' import { PartUi, SegmentUi } from '../SegmentTimelineContainer.js' diff --git a/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx index dbb969e26d5..d1592968875 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx @@ -4,7 +4,7 @@ import { ISourceLayer } from '@sofie-automation/blueprints-integration' import { SegmentTimelineSmallPartFlagIcon } from './SegmentTimelineSmallPartFlagIcon.js' import { protectString, unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { PartUi, SegmentUi } from '../SegmentTimelineContainer.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { SegmentTimelinePartHoverPreview } from './SegmentTimelinePartHoverPreview.js' import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' diff --git a/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx index 8330af6d644..9dff619aadd 100644 --- a/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx +++ b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx @@ -1,5 +1,5 @@ import { ISourceLayerItemProps, SourceLayerItem } from './SourceLayerItem.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { useContentStatusForPieceInstance } from './withMediaObjectStatus.js' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' diff --git a/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx index 0588f2f3a81..3fb7e482da1 100644 --- a/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx +++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx @@ -8,7 +8,7 @@ import { TriggeredActionEntry, TRIGGERED_ACTION_ENTRY_DRAG_TYPE } from './Trigge import { literal } from '@sofie-automation/corelib/dist/lib' import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' import { TriggersHandler } from '../../../../lib/triggers/TriggersHandler.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { MeteorCall } from '../../../../lib/meteorApi.js' diff --git a/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx b/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx index d350a1a0f35..147f5ab1a04 100644 --- a/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx @@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor' import { useTracker } from '../../lib/ReactMeteorData/react-meteor-data.js' import { useTranslation } from 'react-i18next' import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part' import { IAdLibListItem } from './AdLibListItem.js' diff --git a/packages/webui/src/client/ui/Shelf/BucketPanel.tsx b/packages/webui/src/client/ui/Shelf/BucketPanel.tsx index 78ffd8b3071..add5d8c762a 100644 --- a/packages/webui/src/client/ui/Shelf/BucketPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/BucketPanel.tsx @@ -34,7 +34,7 @@ import { IDashboardPanelTrackedProps } from './DashboardPanel.js' import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece' import { Bucket } from '@sofie-automation/corelib/dist/dataModel/Bucket' import { Events as MOSEvents } from '../../lib/data/mos/plugin-support.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MeteorCall } from '../../lib/meteorApi.js' import { DragDropItemTypes } from '../DragDropItemTypes.js' import { BucketPieceButton, IBucketPieceDropResult } from './BucketPieceButton.js' diff --git a/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx b/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx index 6bd15adc843..4a0b021922f 100644 --- a/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx @@ -3,7 +3,7 @@ import { RundownLayoutBase, RundownLayoutColoredBox, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' diff --git a/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx b/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx index 8bb3516613f..928f99df2e7 100644 --- a/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx +++ b/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx @@ -5,7 +5,7 @@ import { ActionButtonType, DashboardLayoutActionButton, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' export interface IDashboardButtonProps { button: DashboardLayoutActionButton diff --git a/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx b/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx index 5ce24201802..15055a5b9ee 100644 --- a/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx +++ b/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx @@ -8,12 +8,12 @@ import { DashboardActionButton } from './DashboardActionButton.js' import { doUserAction, UserAction } from '../../lib/clientUserAction.js' import { withTranslation } from 'react-i18next' import { Translated } from '../../lib/ReactMeteorData/react-meteor-data.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { MeteorCall } from '../../lib/meteorApi.js' import { doModalDialog } from '../../lib/ModalDialog.js' import { NoticeLevel, Notification, NotificationCenter } from '../../lib/notifications/notifications.js' import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids' -import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client' import { hashSingleUseToken } from '../../lib/lib.js' import { UserError } from '@sofie-automation/corelib/dist/error' diff --git a/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx b/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx index e39c28a80a6..c30228c4eeb 100644 --- a/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx +++ b/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx @@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor' import ClassNames from 'classnames' import { RundownUtils } from '../../lib/rundown.js' import { ISourceLayer, IOutputLayer, SourceLayerType, VTContent } from '@sofie-automation/blueprints-integration' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IAdLibListItem } from './AdLibListItem.js' import SplitInputIcon from '../PieceIcons/Renderers/SplitInputIcon.js' import { PieceDisplayStyle } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' diff --git a/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx b/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx index b04d408ba18..19882f5f1bc 100644 --- a/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx @@ -7,7 +7,7 @@ import { import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { dashboardElementStyle } from './DashboardPanel.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' import { ScriptContent } from '@sofie-automation/blueprints-integration' import { getUnfinishedPieceInstancesReactive } from '../../lib/rundownLayouts.js' diff --git a/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx b/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx index 0186ae0feb2..3a51eb59aac 100644 --- a/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx +++ b/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx @@ -11,7 +11,7 @@ import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { dashboardElementStyle } from './DashboardPanel.js' import { assertNever, getRandomString, literal } from '@sofie-automation/corelib/dist/lib' import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { parseMosPluginMessageXml, MosPluginMessage } from '../../lib/parsers/mos/mosXml2Js.js' import { diff --git a/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx b/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx index f612e088b96..3115a181ba2 100644 --- a/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IAdLibListItem } from './AdLibListItem.js' import { AdLibPanel } from './AdLibPanel.js' import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer.js' diff --git a/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx index 229c3360e6d..24af198dbb1 100644 --- a/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx +++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx @@ -13,7 +13,7 @@ import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protected import { doUserAction, UserAction } from '../../../../lib/clientUserAction.js' import { MeteorCall } from '../../../../lib/meteorApi.js' import { BucketAdLibItem, BucketAdLibActionUi } from '../../RundownViewBuckets.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { actionToAdLibPieceUi } from '../../BucketPanel.js' import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus' import { IAdLibListItem } from '../../AdLibListItem.js' diff --git a/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts index 8b587c1cc3f..beed750ef74 100644 --- a/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts +++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts @@ -5,7 +5,7 @@ import ActionItemRenderer, { isActionItem } from './ActionItemRenderer.js' import { PieceUi } from '../../../SegmentTimeline/SegmentTimelineContainer.js' import { BucketAdLibItem } from '../../RundownViewBuckets.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IAdLibListItem } from '../../AdLibListItem.js' import { AdLibPieceUi } from '../../../../lib/shelf.js' import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles' diff --git a/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx index 559fd28b60a..b8c320728a1 100644 --- a/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx +++ b/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx @@ -5,7 +5,7 @@ import { PieceUi } from '../../SegmentTimeline/SegmentTimelineContainer.js' import { ContextMenuTrigger } from '@jstarpl/react-contextmenu' import { contextMenuHoldToDisplayTime } from '../../../lib/lib.js' import { BucketAdLibItem } from '../RundownViewBuckets.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { IAdLibListItem } from '../AdLibListItem.js' import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles' import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios' diff --git a/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx b/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx index b4134fd54c4..e27273284da 100644 --- a/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx @@ -8,7 +8,7 @@ import { } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { dashboardElementStyle } from './DashboardPanel.js' diff --git a/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx b/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx index 7110e1b9724..351f42acb54 100644 --- a/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx @@ -7,7 +7,7 @@ import { } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { dashboardElementStyle } from './DashboardPanel.js' import { Segments } from '../../collections/index.js' diff --git a/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx b/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx index 1d3a0b2414d..549a46c2b25 100644 --- a/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx @@ -4,7 +4,7 @@ import { RundownLayoutBase, RundownLayoutPartName, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' diff --git a/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx b/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx index cd1987a7230..0fdcc7197f0 100644 --- a/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx @@ -4,7 +4,7 @@ import { RundownLayoutPartTiming, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { getAllowSpeaking, getAllowVibrating } from '../../lib/localStorage.js' diff --git a/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx b/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx index 46de9b9eaa2..ed8ff72235e 100644 --- a/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx @@ -10,7 +10,7 @@ import { dashboardElementStyle } from './DashboardPanel.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' import { RundownUtils } from '../../lib/rundown.js' import { RundownTiming, TimingEvent } from '../RundownView/RundownTiming/RundownTiming.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance' import { VTContent } from '@sofie-automation/blueprints-integration' import { getUnfinishedPieceInstancesReactive } from '../../lib/rundownLayouts.js' diff --git a/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx index 426aa6cb939..9df7b178721 100644 --- a/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx @@ -6,7 +6,7 @@ import { } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { dashboardElementStyle } from './DashboardPanel.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistEndTiming } from '../RundownView/RundownTiming/PlaylistEndTiming.js' import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming' import { isLoopRunning } from '../../lib/RundownResolver.js' diff --git a/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx index bef64fdd023..eca1b656053 100644 --- a/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx @@ -4,7 +4,7 @@ import { RundownLayoutBase, RundownLayoutPlaylistName, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' diff --git a/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx index 17451459212..2afa09d7ae7 100644 --- a/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx @@ -6,7 +6,7 @@ import { } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { dashboardElementStyle } from './DashboardPanel.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PlaylistStartTiming } from '../RundownView/RundownTiming/PlaylistStartTiming.js' interface IPlaylistStartTimerPanelProps { diff --git a/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx b/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx index f22472d51da..4d14b8fc0fe 100644 --- a/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx +++ b/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx @@ -9,7 +9,7 @@ import { faBars } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { literal } from '@sofie-automation/corelib/dist/lib' import { unprotectString, ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getElementDocumentOffset } from '../../utils/positions.js' import { UIStateStorage } from '../../lib/UIStateStorage.js' import { doModalDialog, ModalDialogQueueItem } from '../../lib/ModalDialog.js' diff --git a/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx b/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx index 590ac69e125..734827af130 100644 --- a/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx +++ b/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx @@ -4,7 +4,7 @@ import { RundownLayoutBase, RundownLayoutSegmentName, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' diff --git a/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx b/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx index b2444116b9c..0c95c5ac9bd 100644 --- a/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx @@ -7,7 +7,7 @@ import { } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' import { withTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' import { RundownUtils } from '../../lib/rundown.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment' import { SegmentDuration } from '../RundownView/RundownTiming/SegmentDuration.js' import { PartExtended } from '../../lib/RundownResolver.js' diff --git a/packages/webui/src/client/ui/Shelf/Shelf.tsx b/packages/webui/src/client/ui/Shelf/Shelf.tsx index 3948ab2fbb0..d0dbe080eef 100644 --- a/packages/webui/src/client/ui/Shelf/Shelf.tsx +++ b/packages/webui/src/client/ui/Shelf/Shelf.tsx @@ -8,7 +8,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { Translated, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getElementDocumentOffset } from '../../utils/positions.js' import { DashboardLayoutExternalFrame, diff --git a/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx b/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx index 4b2aaf8855e..88a5a5e3a80 100644 --- a/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx +++ b/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx @@ -4,7 +4,7 @@ import { TimelineDashboardPanel } from './TimelineDashboardPanel.js' import { DashboardPanel } from './DashboardPanel.js' import { ExternalFramePanel } from './ExternalFramePanel.js' import { DashboardActionButtonGroup } from './DashboardActionButtonGroup.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { AdLibRegionPanel } from './AdLibRegionPanel.js' import { PieceCountdownPanel } from './PieceCountdownPanel.js' import { BucketAdLibItem } from './RundownViewBuckets.js' diff --git a/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx b/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx index 25734e78578..037b0e86ef6 100644 --- a/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx +++ b/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx @@ -8,7 +8,7 @@ import { AdLibPanel } from './AdLibPanel.js' import { AdLibPieceUi } from '../../lib/shelf.js' import { GlobalAdLibPanel } from './GlobalAdLibPanel.js' import { HotkeyHelpPanel } from './HotkeyHelpPanel.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer.js' import { useTranslation } from 'react-i18next' import { BucketAdLibItem } from './RundownViewBuckets.js' diff --git a/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx b/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx index 15f43312e12..9f625f5b974 100644 --- a/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx +++ b/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx @@ -3,7 +3,7 @@ import { RundownLayoutBase, RundownLayoutShowStyleDisplay, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant' diff --git a/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx b/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx index a1229cd7ff4..7c79ae0248e 100644 --- a/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx @@ -13,7 +13,7 @@ import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/coreli import { RundownPlaylists, Rundowns } from '../../collections/index.js' import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil.js' import { useTranslation } from 'react-i18next' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' interface ISystemStatusPanelProps { studioId: StudioId diff --git a/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx b/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx index 00133db61b7..741e87f0762 100644 --- a/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx @@ -4,7 +4,7 @@ import { RundownLayoutBase, RundownLayoutTextLabel, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' diff --git a/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx b/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx index 0972663fe4e..ca19e49478e 100644 --- a/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx +++ b/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx @@ -3,7 +3,7 @@ import { RundownLayoutBase, RundownLayoutTimeOfDay, } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { dashboardElementStyle } from './DashboardPanel.js' import { RundownLayoutsAPI } from '../../lib/rundownLayouts.js' import { useTranslation } from 'react-i18next' diff --git a/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx b/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx index 5d94e3ac0f4..6aef50847be 100644 --- a/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx +++ b/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { Translated, useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js' -import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist' +import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist' import { getCurrentTime } from '../../lib/systemTime.js' import { invalidateAfter } from '../../lib/invalidatingTime.js' import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'