Skip to content

Commit fe2ab51

Browse files
committed
feat: kairos
1 parent 9182e8c commit fe2ab51

File tree

17 files changed

+77
-38
lines changed

17 files changed

+77
-38
lines changed

meteor/server/publications/packageManager/expectedPackages/util.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib
55

66
type MappingExtWithOriginalName = MappingExt & { originalLayerName: string }
77
type MappingsExtWithOriginalName = {
8-
[layerName: string]: MappingExtWithOriginalName
8+
[layerName: string]: ReadonlyDeep<MappingExtWithOriginalName>
99
}
1010
export function buildMappingsToDeviceIdMap(
1111
routeSets: Record<string, StudioRouteSet>,
1212
studioMappings: ReadonlyDeep<MappingsExt>
1313
): Map<string, PeripheralDeviceId[]> {
1414
// Map the expectedPackages onto their specified layer:
1515
const mappingsWithPackages: MappingsExtWithOriginalName = {}
16-
for (const [layerName, mapping] of Object.entries<MappingExt>(studioMappings)) {
16+
for (const [layerName, mapping] of Object.entries<ReadonlyDeep<MappingExt>>(studioMappings)) {
1717
mappingsWithPackages[layerName] = {
1818
...mapping,
1919
originalLayerName: layerName,
@@ -26,7 +26,7 @@ export function buildMappingsToDeviceIdMap(
2626

2727
// Compile the result
2828
const result = new Map<string, PeripheralDeviceId[]>()
29-
for (const item of Object.values<MappingExtWithOriginalName>(routedMappings)) {
29+
for (const item of Object.values<ReadonlyDeep<MappingExtWithOriginalName>>(routedMappings)) {
3030
const key = item.originalLayerName
3131
const existing = result.get(key)
3232
if (existing) {

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ function routeExpectedPackage(
11521152
expectedPackage: ExpectedPackage.Base
11531153
): Set<PeripheralDeviceId> {
11541154
// Collect the relevant mappings
1155-
const mappingsWithPackages: MappingsExt = {}
1155+
const mappingsWithPackages: { [layerName: string]: ReadonlyDeep<MappingExt> } = {}
11561156
for (const layerName of expectedPackage.layers) {
11571157
const mapping = studioMappings[layerName]
11581158

@@ -1167,5 +1167,5 @@ function routeExpectedPackage(
11671167
const routedMappings = getRoutedMappings(mappingsWithPackages, routes)
11681168

11691169
// Find the referenced deviceIds
1170-
return new Set(Object.values<MappingExt>(routedMappings).map((mapping) => mapping.deviceId))
1170+
return new Set(Object.values<ReadonlyDeep<MappingExt>>(routedMappings).map((mapping) => mapping.deviceId))
11711171
}

meteor/yarn.lock

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ __metadata:
11911191
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
11921192
dependencies:
11931193
"@mos-connection/model": "npm:^4.3.1"
1194-
timeline-state-resolver-types: "npm:9.3.1-nrk.1"
1194+
timeline-state-resolver-types: "npm:9.3.1-nightly-feat-nrk-r52-kairos-20251103-122238-ddd81f135.0"
11951195
tslib: "npm:^2.8.1"
11961196
type-fest: "npm:^4.33.0"
11971197
languageName: node
@@ -6733,6 +6733,15 @@ __metadata:
67336733
languageName: node
67346734
linkType: hard
67356735

6736+
"kairos-lib@npm:0.2.0":
6737+
version: 0.2.0
6738+
resolution: "kairos-lib@npm:0.2.0"
6739+
dependencies:
6740+
tslib: "npm:^2.8.1"
6741+
checksum: 10/f09b85dec6a7fe1bc6bc238c4605d778c166c40c7f44bc46bef5ba9ceb9fe302ff24ea36e4c612d849516b89b58244b981d34bd56206dede73a1998e8eb5c15d
6742+
languageName: node
6743+
linkType: hard
6744+
67366745
"keygrip@npm:~1.1.0":
67376746
version: 1.1.0
67386747
resolution: "keygrip@npm:1.1.0"
@@ -10234,12 +10243,13 @@ __metadata:
1023410243
languageName: node
1023510244
linkType: hard
1023610245

10237-
"timeline-state-resolver-types@npm:9.3.1-nrk.1":
10238-
version: 9.3.1-nrk.1
10239-
resolution: "timeline-state-resolver-types@npm:9.3.1-nrk.1"
10246+
"timeline-state-resolver-types@npm:9.3.1-nightly-feat-nrk-r52-kairos-20251103-122238-ddd81f135.0":
10247+
version: 9.3.1-nightly-feat-nrk-r52-kairos-20251103-122238-ddd81f135.0
10248+
resolution: "timeline-state-resolver-types@npm:9.3.1-nightly-feat-nrk-r52-kairos-20251103-122238-ddd81f135.0"
1024010249
dependencies:
10250+
kairos-lib: "npm:0.2.0"
1024110251
tslib: "npm:^2.6.3"
10242-
checksum: 10/9d4737302ac4ec96e597fe4cab10cffced3bc66d016439de8c282d7a5582bd8c54cea3a46ce09234594301b199f9c30aa115d1e38ac7a3caefbc4f2ffb6f2c35
10252+
checksum: 10/aec2f6a99dc2a707e365338477096aa38fc74369272eed133ff2eea118eaf3111433c5654acc5efbaa0fad13432f5d3caa3199f4e01463f61145ebc2476a8755
1024310253
languageName: node
1024410254
linkType: hard
1024510255

packages/blueprints-integration/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"@sofie-automation/blueprints-integration": ["./src/index.ts"]
1111
},
1212
"resolveJsonModule": true,
13-
"types": ["node"]
13+
"types": ["node"],
14+
"moduleResolution": "node16"
1415
}
1516
}

packages/corelib/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@sofie-automation/corelib": ["./src/index.ts"]
1212
},
1313
"resolveJsonModule": true,
14-
"types": ["node"]
14+
"types": ["node"],
15+
"moduleResolution": "node16"
1516
}
1617
}

packages/job-worker/src/playout/lookahead/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function parseSearchDistance(rawVal: number | undefined): number {
3535
}
3636
}
3737

38-
function findLargestLookaheadDistance(mappings: Array<[string, MappingExt]>): number {
38+
function findLargestLookaheadDistance(mappings: Array<[string, ReadonlyDeep<MappingExt>]>): number {
3939
const values = mappings.map(([_id, m]) => parseSearchDistance(m.lookaheadMaxSearchDistance))
4040
return _.max(values)
4141
}
@@ -65,7 +65,7 @@ export async function getLookeaheadObjects(
6565
): Promise<Array<TimelineObjRundown & OnGenerateTimelineObjExt>> {
6666
const span = context.startSpan('getLookeaheadObjects')
6767
const allMappings = context.studio.mappings
68-
const mappingsToConsider = Object.entries<MappingExt>(allMappings).filter(
68+
const mappingsToConsider = Object.entries<ReadonlyDeep<MappingExt>>(allMappings).filter(
6969
([_id, map]) => map.lookahead !== LookaheadMode.NONE && map.lookahead !== undefined
7070
)
7171
if (mappingsToConsider.length === 0) {

packages/job-worker/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"resolveJsonModule": true,
1313
"types": ["node"],
14-
"skipLibCheck": true
14+
"skipLibCheck": true,
15+
"moduleResolution": "node16"
1516
}
1617
}

packages/live-status-gateway/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"live-status-gateway": ["./src/index.ts"]
1111
},
1212
"types": ["node"],
13-
"resolveJsonModule": true
13+
"resolveJsonModule": true,
14+
"moduleResolution": "node16"
1415
},
1516
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
} from '@sofie-automation/corelib/dist/dataModel/Studio'
88
import { omit } from '@sofie-automation/corelib/dist/lib'
99
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
10+
import { ReadonlyDeep } from 'type-fest'
1011

1112
export function getActiveRoutes(routeSets: Record<string, StudioRouteSet>): ResultingMappingRoutes {
1213
const routes: ResultingMappingRoutes = {
@@ -47,7 +48,7 @@ export function getActiveRoutes(routeSets: Record<string, StudioRouteSet>): Resu
4748

4849
return routes
4950
}
50-
export function getRoutedMappings<M extends MappingExt>(
51+
export function getRoutedMappings<M extends ReadonlyDeep<MappingExt>>(
5152
inputMappings: { [layerName: string]: M },
5253
mappingRoutes: ResultingMappingRoutes
5354
): { [layerName: string]: M } {

packages/meteor-lib/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@sofie-automation/corelib": ["./src/index.ts"]
1212
},
1313
"resolveJsonModule": true,
14-
"types": ["node"]
14+
"types": ["node"],
15+
"moduleResolution": "node16"
1516
}
1617
}

0 commit comments

Comments
 (0)