Skip to content

Commit e6c6ba1

Browse files
committed
chore: use stateChacheResolver functions from corelib
1 parent 4d3a4cd commit e6c6ba1

File tree

75 files changed

+299
-790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+299
-790
lines changed

meteor/__mocks__/helpers/database.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ import {
3333
SofieIngestSegment,
3434
SofieIngestRundown,
3535
} from '@sofie-automation/blueprints-integration'
36-
import { DBShowStyleBase, UIShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
36+
import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
3737
import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
3838
import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
3939
import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
4040
import { stripVersion } from '../../server/systemStatus/semverUtils'
4141
import { internalUploadBlueprint } from '../../server/api/blueprints/api'
42-
import { literal, getRandomId, getRandomString, Complete, normalizeArray } from '@sofie-automation/corelib/dist/lib'
42+
import { literal, getRandomId, getRandomString, normalizeArray } from '@sofie-automation/corelib/dist/lib'
4343
import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
4444
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
4545
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -891,14 +891,3 @@ export async function setupMockWorker(doc?: Partial<WorkerStatus>): Promise<{
891891
// const studioBlueprint
892892
// const showStyleBlueprint
893893
// const showStyleVariant
894-
895-
export function convertToUIShowStyleBase(showStyleBase: DBShowStyleBase): UIShowStyleBase {
896-
return literal<Complete<UIShowStyleBase>>({
897-
_id: showStyleBase._id,
898-
name: showStyleBase.name,
899-
hotkeyLegend: showStyleBase.hotkeyLegend,
900-
sourceLayers: applyAndValidateOverrides(showStyleBase.sourceLayersWithOverrides).obj,
901-
outputLayers: applyAndValidateOverrides(showStyleBase.outputLayersWithOverrides).obj,
902-
abChannelDisplay: showStyleBase.abChannelDisplay,
903-
})
904-
}

packages/corelib/src/__tests__/mongo.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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'
22
import { FindOptions, mongoFindOptions, MongoQuery, mongoWhere } from '../mongo.js'
33

44
describe('mongoFindOptions', () => {

packages/corelib/src/dataModel/AdlibAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { IBlueprintActionManifest } from '@sofie-automation/blueprints-integration'
22
import { ArrayElement } from '../lib.js'
33
import { ITranslatableMessage } from '../TranslatableMessage.js'
4-
import { ProtectedStringProperties } from '../protectedString.js'
4+
import { ProtectedStringProperties } from '@sofie-automation/shared-lib/dist/lib/protectedString'
55
import { RundownId, AdLibActionId, PartId } from './Ids.js'
66

77
/** The following extended interface allows assigning namespace information to the actions as they are stored in the

packages/corelib/src/dataModel/Blueprint.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@sofie-automation/blueprints-integration'
77
import { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
88
import { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
9-
import { ProtectedString } from '../protectedString.js'
9+
import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
1010
import { BlueprintId } from './Ids.js'
1111
import type { PackageStatusMessage } from '@sofie-automation/shared-lib/dist/packageStatusMessages'
1212

packages/corelib/src/dataModel/ExpectedPackages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ExpectedPackage, Time } from '@sofie-automation/blueprints-integration'
2-
import { protectString } from '../protectedString.js'
2+
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
33
import { getHash, hashObj } from '../lib.js'
44
import {
55
AdLibActionId,

packages/corelib/src/dataModel/ExternalMessageQueue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Time,
44
IBlueprintExternalMessageQueueType,
55
} from '@sofie-automation/blueprints-integration'
6-
import { ProtectedStringProperties } from '../protectedString.js'
6+
import { ProtectedStringProperties } from '@sofie-automation/shared-lib/dist/lib/protectedString'
77
import { ExternalMessageQueueObjId, StudioId, RundownId } from './Ids.js'
88

99
export interface ExternalMessageQueueObj extends ProtectedStringProperties<IBlueprintExternalMessageQueueObj, '_id'> {

packages/corelib/src/dataModel/Ids.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ProtectedString } from '../protectedString.js'
1+
import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
22

33
/** A string, identifying an activation of a playlist */
44
export type ActiveInstanceId = ProtectedString<'ActiveInstanceId'>

packages/corelib/src/dataModel/MediaObjects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ProtectedString } from '../protectedString.js'
1+
import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
22

33
export interface MediaObjects {
44
_id: ProtectedString<'MediaObjId'>

packages/corelib/src/dataModel/PackageContainerPackageStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ExpectedPackageStatusAPI, Time } from '@sofie-automation/blueprints-integration'
2-
import { protectString } from '../protectedString.js'
2+
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
33
import { ExpectedPackageId, PackageContainerPackageId, PeripheralDeviceId, StudioId } from './Ids.js'
44

55
/**

packages/corelib/src/dataModel/PackageContainerStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
import { ExpectedPackageStatusAPI, Time } from '@sofie-automation/blueprints-integration'
11-
import { protectString } from '../protectedString.js'
11+
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
1212
import { StudioId, PeripheralDeviceId, PackageContainerId } from './Ids.js'
1313

1414
export interface PackageContainerStatusDB {

0 commit comments

Comments
 (0)