fix: imports

justandras · justandras · commit a117d2ec2ba5 · 2026-03-05T16:16:03.000+01:00
diff --git a/packages/corelib/src/__tests__/mongo.spec.ts b/packages/corelib/src/__tests__/mongo.spec.ts
@@ -1,4 +1,4 @@
-import { protectString, ProtectedString } from '../protectedString.js'
+import { protectString, ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { FindOptions, mongoFindOptions, MongoQuery, mongoWhere } from '../mongo.js'
 
 describe('mongoFindOptions', () => {
diff --git a/packages/corelib/src/dataModel/AdlibAction.ts b/packages/corelib/src/dataModel/AdlibAction.ts
@@ -1,7 +1,7 @@
 import { IBlueprintActionManifest } from '@sofie-automation/blueprints-integration'
 import { ArrayElement } from '../lib.js'
 import { ITranslatableMessage } from '../TranslatableMessage.js'
-import { ProtectedStringProperties } from '../protectedString.js'
+import { ProtectedStringProperties } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { RundownId, AdLibActionId, PartId } from './Ids.js'
 
 /** The following extended interface allows assigning namespace information to the actions as they are stored in the
diff --git a/packages/corelib/src/dataModel/Blueprint.ts b/packages/corelib/src/dataModel/Blueprint.ts
@@ -6,7 +6,7 @@ import {
 } from '@sofie-automation/blueprints-integration'
 import { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 import { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
-import { ProtectedString } from '../protectedString.js'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { BlueprintId } from './Ids.js'
 import type { PackageStatusMessage } from '@sofie-automation/shared-lib/dist/packageStatusMessages'
 
diff --git a/packages/corelib/src/dataModel/ExpectedPackages.ts b/packages/corelib/src/dataModel/ExpectedPackages.ts
@@ -1,5 +1,5 @@
 import { ExpectedPackage, Time } from '@sofie-automation/blueprints-integration'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { getHash, hashObj } from '../lib.js'
 import {
 	AdLibActionId,
diff --git a/packages/corelib/src/dataModel/ExternalMessageQueue.ts b/packages/corelib/src/dataModel/ExternalMessageQueue.ts
@@ -3,7 +3,7 @@ import {
 	Time,
 	IBlueprintExternalMessageQueueType,
 } from '@sofie-automation/blueprints-integration'
-import { ProtectedStringProperties } from '../protectedString.js'
+import { ProtectedStringProperties } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { ExternalMessageQueueObjId, StudioId, RundownId } from './Ids.js'
 
 export interface ExternalMessageQueueObj extends ProtectedStringProperties<IBlueprintExternalMessageQueueObj, '_id'> {
diff --git a/packages/corelib/src/dataModel/Ids.ts b/packages/corelib/src/dataModel/Ids.ts
@@ -1,4 +1,4 @@
-import { ProtectedString } from '../protectedString.js'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 /** A string, identifying an activation of a playlist */
 export type ActiveInstanceId = ProtectedString<'ActiveInstanceId'>
diff --git a/packages/corelib/src/dataModel/MediaObjects.ts b/packages/corelib/src/dataModel/MediaObjects.ts
@@ -1,4 +1,4 @@
-import { ProtectedString } from '../protectedString.js'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 export interface MediaObjects {
 	_id: ProtectedString<'MediaObjId'>
diff --git a/packages/corelib/src/dataModel/PackageContainerPackageStatus.ts b/packages/corelib/src/dataModel/PackageContainerPackageStatus.ts
@@ -1,5 +1,5 @@
 import { ExpectedPackageStatusAPI, Time } from '@sofie-automation/blueprints-integration'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { ExpectedPackageId, PackageContainerPackageId, PeripheralDeviceId, StudioId } from './Ids.js'
 
 /**
diff --git a/packages/corelib/src/dataModel/PackageContainerStatus.ts b/packages/corelib/src/dataModel/PackageContainerStatus.ts
@@ -8,7 +8,7 @@
  */
 
 import { ExpectedPackageStatusAPI, Time } from '@sofie-automation/blueprints-integration'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { StudioId, PeripheralDeviceId, PackageContainerId } from './Ids.js'
 
 export interface PackageContainerStatusDB {
diff --git a/packages/corelib/src/dataModel/PackageInfos.ts b/packages/corelib/src/dataModel/PackageInfos.ts
@@ -1,5 +1,5 @@
 import { PackageInfo, Time } from '@sofie-automation/blueprints-integration'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { ExpectedPackageId, PackageInfoId, PeripheralDeviceId, StudioId } from './Ids.js'
 
 /**
diff --git a/packages/corelib/src/dataModel/Piece.ts b/packages/corelib/src/dataModel/Piece.ts
@@ -5,11 +5,11 @@ import {
 	TimelineObjectCoreExt,
 	SomeContent,
 } from '@sofie-automation/blueprints-integration'
-import { ProtectedString, protectString, unprotectString } from '../protectedString.js'
 import { PieceId, RundownId, SegmentId, PartId } from './Ids.js'
 import { CoreUserEditingDefinition, CoreUserEditingProperties } from './UserEditingDefinitions.js'
 import { PieceInstanceWithTimings } from '../playout/processAndPrune.js'
 import { IOutputLayerExtended, ISourceLayerExtended } from './ShowStyleBase.js'
+import { ProtectedString, protectString, unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 /** A generic list of playback availability statuses for a Piece */
 export enum PieceStatusCode {
@@ -53,8 +53,7 @@ export interface PieceGeneric extends Omit<IBlueprintPieceGeneric, 'content'> {
 	timelineObjectsString: PieceTimelineObjectsBlob
 }
 export interface Piece
-	extends PieceGeneric,
-		Omit<IBlueprintPieceDB, '_id' | 'content' | 'userEditOperations' | 'userEditProperties'> {
+	extends PieceGeneric, Omit<IBlueprintPieceDB, '_id' | 'content' | 'userEditOperations' | 'userEditProperties'> {
 	/** Timeline enabler. When the piece should be active on the timeline. */
 	enable: {
 		start: number | 'now' // TODO - now will be removed from this eventually, but as it is not an acceptable value 99% of the time, that is not really breaking
diff --git a/packages/corelib/src/dataModel/PieceContentStatus.ts b/packages/corelib/src/dataModel/PieceContentStatus.ts
@@ -1,5 +1,5 @@
 import { ITranslatableMessage, PackageInfo } from '@sofie-automation/blueprints-integration'
-import { ProtectedString } from '../protectedString.js'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import {
 	RundownId,
 	PartId,
diff --git a/packages/corelib/src/dataModel/PieceInstance.ts b/packages/corelib/src/dataModel/PieceInstance.ts
@@ -1,5 +1,5 @@
 import { Time } from '@sofie-automation/blueprints-integration'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import {
 	PieceInstanceInfiniteId,
 	RundownPlaylistActivationId,
diff --git a/packages/corelib/src/lib.ts b/packages/corelib/src/lib.ts
@@ -1,14 +1,14 @@
 import _ from 'underscore'
 import { ReadonlyDeep } from 'type-fest'
 import fastClone from 'fast-clone'
-import { ProtectedString, protectString } from './protectedString.js'
 import * as objectPath from 'object-path'
 import { Timecode } from 'timecode'
 import { iterateDeeply, iterateDeeplyEnum, Time } from '@sofie-automation/blueprints-integration'
 import { IStudioSettings } from './dataModel/Studio.js'
 import { customAlphabet as createNanoid } from 'nanoid'
 import type { ITranslatableMessage } from './TranslatableMessage.js'
 import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep'
+import { ProtectedString, protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 /**
  * Limited character set to use for id generation
diff --git a/packages/corelib/src/mongo.ts b/packages/corelib/src/mongo.ts
@@ -1,5 +1,5 @@
 import _ from 'underscore'
-import { ProtectedString } from './protectedString.js'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import * as objectPath from 'object-path'
 import type { Condition, Filter, UpdateFilter } from 'mongodb'
 import { clone } from './lib.js'
diff --git a/packages/corelib/src/playout/__tests__/infinites.test.ts b/packages/corelib/src/playout/__tests__/infinites.test.ts
@@ -6,7 +6,7 @@ import { EmptyPieceTimelineObjectsBlob, Piece } from '../../dataModel/Piece.js'
 import { PieceInstance, PieceInstancePiece } from '../../dataModel/PieceInstance.js'
 import { Rundown, DBRundown } from '../../dataModel/Rundown.js'
 import { literal } from '../../lib.js'
-import { protectString } from '../../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { getPlayheadTrackingInfinitesForPart } from '../infinites.js'
 import { DBSegment, SegmentOrphanedReason } from '../../dataModel/Segment.js'
 
diff --git a/packages/corelib/src/playout/__tests__/processAndPrune.test.ts b/packages/corelib/src/playout/__tests__/processAndPrune.test.ts
@@ -3,7 +3,7 @@ import clone from 'fast-clone'
 import { EmptyPieceTimelineObjectsBlob, Piece } from '../../dataModel/Piece.js'
 import { PieceInstance, PieceInstancePiece, ResolvedPieceInstance } from '../../dataModel/PieceInstance.js'
 import { literal } from '../../lib.js'
-import { protectString } from '../../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import {
 	createPartCurrentTimes,
 	PartCurrentTimes,
diff --git a/packages/corelib/src/playout/ids.ts b/packages/corelib/src/playout/ids.ts
@@ -1,7 +1,7 @@
 import { PartInstanceId, PieceInstanceId } from '../dataModel/Ids.js'
 import { DBPartInstance } from '../dataModel/PartInstance.js'
 import { PieceInstance } from '../dataModel/PieceInstance.js'
-import { isProtectedString } from '../protectedString.js'
+import { isProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 enum PlayoutTimelinePrefixes {
 	PART_GROUP_PREFIX = 'part_group_',
diff --git a/packages/corelib/src/playout/infinites.ts b/packages/corelib/src/playout/infinites.ts
@@ -14,7 +14,7 @@ import { DBPartInstance } from '../dataModel/PartInstance.js'
 import { DBRundown } from '../dataModel/Rundown.js'
 import { ReadonlyDeep } from 'type-fest'
 import { assertNever, clone, flatten, getRandomId, groupByToMapFunc, max, normalizeArrayToMapFunc } from '../lib.js'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import _ from 'underscore'
 import { MongoQuery } from '../mongo.js'
 import { DBSegment, SegmentOrphanedReason } from '../dataModel/Segment.js'
diff --git a/packages/corelib/src/playout/stateCacheResolver.ts b/packages/corelib/src/playout/stateCacheResolver.ts
@@ -25,7 +25,7 @@ import { DBRundownPlaylist, QuickLoopMarkerType } from '../dataModel/RundownPlay
 import { DBSegment, SegmentExtended, SegmentOrphanedReason } from '../dataModel/Segment.js'
 import { assertNever, literal, groupByToMap, Complete } from '../lib.js'
 import { FindOneOptions, FindOptions, MongoQuery, mongoWhereFilter } from '../mongo.js'
-import { protectString } from '../protectedString.js'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import {
 	createPartCurrentTimes,
 	processAndPrunePieceInstanceTimings,
diff --git a/packages/corelib/src/studio/baseline.ts b/packages/corelib/src/studio/baseline.ts
@@ -1,7 +1,7 @@
 import { DBStudio } from '../dataModel/Studio.js'
 import { TimelineComplete } from '../dataModel/Timeline.js'
 import { ReadonlyDeep } from 'type-fest'
-import { unprotectString } from '../protectedString.js'
+import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 import { Blueprint } from '../dataModel/Blueprint.js'
 
 export function shouldUpdateStudioBaselineInner(
diff --git a/packages/shared-lib/src/core/model/Timeline.ts b/packages/shared-lib/src/core/model/Timeline.ts
@@ -133,8 +133,9 @@ export enum LookaheadMode {
 export interface BlueprintMappings extends TSR.Mappings {
 	[layerName: string]: BlueprintMapping
 }
-export interface BlueprintMapping<TOptions extends { mappingType: string } | unknown = TSR.TSRMappingOptions>
-	extends TSR.Mapping<TOptions> {
+export interface BlueprintMapping<
+	TOptions extends { mappingType: string } | unknown = TSR.TSRMappingOptions,
+> extends TSR.Mapping<TOptions> {
 	/** What method core should use to create lookahead objects for this layer */
 	lookahead: LookaheadMode
 	/** How many lookahead objects to create for this layer. Default = 1 */
@@ -146,8 +147,10 @@ export interface BlueprintMapping<TOptions extends { mappingType: string } | unk
 export interface MappingsExt {
 	[layerName: string]: MappingExt
 }
-export interface MappingExt<TOptions extends { mappingType: string } | unknown = TSR.TSRMappingOptions>
-	extends Omit<BlueprintMapping<TOptions>, 'deviceId'> {
+export interface MappingExt<TOptions extends { mappingType: string } | unknown = TSR.TSRMappingOptions> extends Omit<
+	BlueprintMapping<TOptions>,
+	'deviceId'
+> {
 	deviceId: PeripheralDeviceId
 }
 export interface RoutedMappings {
diff --git a/packages/webui/src/client/ui/SegmentList/SegmentList.tsx b/packages/webui/src/client/ui/SegmentList/SegmentList.tsx
@@ -17,7 +17,11 @@ import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { NoteSeverity } from '@sofie-automation/blueprints-integration'
 import { ISourceLayerExtended } from '@sofie-automation/corelib/src/dataModel/ShowStyleBase.js'
 import { PieceUi } from '@sofie-automation/corelib/src/dataModel/Piece.js'
-import { isLoopRunning, isQuickLoopStart, isQuickLoopEnd } from '@sofie-automation/corelib'
+import {
+	isLoopRunning,
+	isQuickLoopEnd,
+	isQuickLoopStart,
+} from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
 
 interface IProps {
 	id: string
diff --git a/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
@@ -41,7 +41,12 @@ import { SegmentTimeAnchorTime } from '../RundownView/RundownTiming/SegmentTimeA
 import { logger } from '../../lib/logging.js'
 import { UIStudio } from '@sofie-automation/corelib/src/dataModel/Studio.js'
 import { PieceUi } from '@sofie-automation/corelib/src/dataModel/Piece.js'
-import { isLoopRunning, isEndOfLoopingShow, isQuickLoopStart, isQuickLoopEnd } from '@sofie-automation/corelib'
+import {
+	isEndOfLoopingShow,
+	isLoopRunning,
+	isQuickLoopEnd,
+	isQuickLoopStart,
+} from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
 
 interface IProps {
 	id: string

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { protectString, ProtectedString } from '../protectedString.js'`
	`1`	`+import { protectString, ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'`
`2`	`2`	`import { FindOptions, mongoFindOptions, MongoQuery, mongoWhere } from '../mongo.js'`
`3`	`3`
`4`	`4`	`describe('mongoFindOptions', () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ProtectedString } from '../protectedString.js'`
	`1`	`+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'`
`2`	`2`
`3`	`3`	`/** A string, identifying an activation of a playlist */`
`4`	`4`	`export type ActiveInstanceId = ProtectedString<'ActiveInstanceId'>`