Skip to content

Commit f54d9ca

Browse files
committed
feat: move GW config types to generated in shared lib
1 parent c8e669f commit f54d9ca

File tree

10 files changed

+11
-107
lines changed

10 files changed

+11
-107
lines changed

packages/blueprints-integration/src/api/studio.ts

+6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ import type {
2929
import type { StudioPackageContainer } from '@sofie-automation/shared-lib/dist/core/model/PackageContainer'
3030
import type { IStudioSettings } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings'
3131
import type { MosDeviceConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
32+
import type { MosGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayOptionsTypes'
3233
import type { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
34+
import type { LiveStatusGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/LiveStatusGatewayOptionsTypes'
3335

3436
export interface StudioBlueprintManifest<TRawConfig = IBlueprintConfig, TProcessedConfig = unknown>
3537
extends BlueprintManifestBase {
@@ -172,10 +174,14 @@ export interface BlueprintParentDeviceSettings {
172174
options: Record<string, any>
173175
}
174176

177+
export type BlueprintMosGatewayConfig = MosGatewayConfig
178+
175179
export type BlueprintMosDeviceConfig = MosDeviceConfig
176180

177181
export type BlueprintPlayoutGatewayConfig = PlayoutGatewayConfig
178182

183+
export type BlueprintLiveStatusGatewayConfig = LiveStatusGatewayConfig
184+
179185
export interface IStudioConfigPreset<TConfig = IBlueprintConfig> {
180186
name: string
181187

packages/live-status-gateway/src/coreHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedSt
2323
import { PeripheralDeviceCommandId, StudioId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
2424
import { StatusCode } from '@sofie-automation/shared-lib/dist/lib/status'
2525
import { PeripheralDeviceCommand } from '@sofie-automation/shared-lib/dist/core/model/PeripheralDeviceCommand'
26-
import { LiveStatusGatewayConfig } from './generated/options'
26+
import { LiveStatusGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/LiveStatusGatewayOptionsTypes'
2727
import { CorelibPubSubTypes, CorelibPubSubCollections } from '@sofie-automation/corelib/dist/pubsub'
2828
import { ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration/dist/lib/subscriptions'
2929

packages/live-status-gateway/src/generated/options.ts

-13
This file was deleted.

packages/mos-gateway/src/generated/devices.ts

-34
This file was deleted.

packages/mos-gateway/src/generated/options.ts

-17
This file was deleted.

packages/mos-gateway/src/mosHandler.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import {
3232
DEFAULT_MOS_TIMEOUT_TIME,
3333
DEFAULT_MOS_HEARTBEAT_INTERVAL,
3434
} from '@sofie-automation/shared-lib/dist/core/constants'
35-
import { MosGatewayConfig } from './generated/options'
36-
import { MosDeviceConfig } from './generated/devices'
35+
import { MosGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayOptionsTypes'
36+
import { MosDeviceConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
3737
import { PeripheralDeviceForDevice } from '@sofie-automation/server-core-integration'
3838

3939
export interface MosConfig {

packages/playout-gateway/src/coreHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { PLAYOUT_DEVICE_CONFIG } from './configManifest'
2323
import { BaseRemoteDeviceIntegration } from 'timeline-state-resolver/dist/service/remoteDeviceInstance'
2424
import { getVersions } from './versions'
2525
import { CoreConnectionChild } from '@sofie-automation/server-core-integration/dist/lib/CoreConnectionChild'
26-
import { PlayoutGatewayConfig } from './generated/options'
26+
import { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
2727
import { PeripheralDeviceCommandId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
2828

2929
export interface CoreConfig {

packages/playout-gateway/src/generated/options.ts

-34
This file was deleted.

packages/playout-gateway/src/tsrHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
TimelineObjGeneric,
3838
} from '@sofie-automation/shared-lib/dist/core/model/Timeline'
3939
import { PLAYOUT_DEVICE_CONFIG } from './configManifest'
40-
import { PlayoutGatewayConfig } from './generated/options'
40+
import { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
4141
import {
4242
assertNever,
4343
getSchemaDefaultValues,

packages/scripts/schema-types.mjs

-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ try {
2222
bannerComment: '',
2323
})
2424

25-
await fs.writeFile('./playout-gateway/src/generated/options.ts', BANNER + '\n' + schema)
2625
await fs.writeFile('./shared-lib/src/generated/PlayoutGatewayConfigTypes.ts', BANNER + '\n' + schema)
2726
} catch (e) {
2827
console.error('Error while generating playout-gateway options.json, continuing...')
@@ -37,7 +36,6 @@ try {
3736
bannerComment: '',
3837
})
3938

40-
await fs.writeFile('./mos-gateway/src/generated/options.ts', BANNER + '\n' + schema)
4139
await fs.writeFile('./shared-lib/src/generated/MosGatewayOptionsTypes.ts', BANNER + '\n' + schema)
4240
} catch (e) {
4341
console.error('Error while generating mos-gateway options.json, continuing...')
@@ -50,7 +48,6 @@ try {
5048
bannerComment: '',
5149
})
5250

53-
await fs.writeFile('./mos-gateway/src/generated/devices.ts', BANNER + '\n' + schema)
5451
await fs.writeFile('./shared-lib/src/generated/MosGatewayDevicesTypes.ts', BANNER + '\n' + schema)
5552
} catch (e) {
5653
console.error('Error while generating mos-gateway devices.json, continuing...')
@@ -65,7 +62,6 @@ try {
6562
bannerComment: '',
6663
})
6764

68-
await fs.writeFile('./live-status-gateway/src/generated/options.ts', BANNER + '\n' + schema)
6965
await fs.writeFile('./shared-lib/src/generated/LiveStatusGatewayOptionsTypes.ts', BANNER + '\n' + schema)
7066
} catch (e) {
7167
console.error('Error while generating live-status-gateway options.json, continuing...')

0 commit comments

Comments
 (0)