feat: move GW config types to generated in shared lib

olzzon · olzzon · commit 161adfbda418 · 2025-02-20T08:31:50.000+01:00
diff --git a/packages/blueprints-integration/src/api/studio.ts b/packages/blueprints-integration/src/api/studio.ts
@@ -29,7 +29,9 @@ import type {
 import type { StudioPackageContainer } from '@sofie-automation/shared-lib/dist/core/model/PackageContainer'
 import type { IStudioSettings } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings'
 import type { MosDeviceConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
+import type { MosGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayOptionsTypes'
 import type { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
+import type { LiveStatusGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/LiveStatusGatewayOptionsTypes'
 
 export interface StudioBlueprintManifest<TRawConfig = IBlueprintConfig, TProcessedConfig = unknown>
 	extends BlueprintManifestBase {
@@ -172,10 +174,14 @@ export interface BlueprintParentDeviceSettings {
 	options: Record<string, any>
 }
 
+export type BlueprintMosGatewayConfig = MosGatewayConfig
+
 export type BlueprintMosDeviceConfig = MosDeviceConfig
 
 export type BlueprintPlayoutGatewayConfig = PlayoutGatewayConfig
 
+export type BlueprintLiveStatusGatewayConfig = LiveStatusGatewayConfig
+
 export interface IStudioConfigPreset<TConfig = IBlueprintConfig> {
 	name: string
 
diff --git a/packages/live-status-gateway/src/coreHandler.ts b/packages/live-status-gateway/src/coreHandler.ts
@@ -23,7 +23,7 @@ import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedSt
 import { PeripheralDeviceCommandId, StudioId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
 import { StatusCode } from '@sofie-automation/shared-lib/dist/lib/status'
 import { PeripheralDeviceCommand } from '@sofie-automation/shared-lib/dist/core/model/PeripheralDeviceCommand'
-import { LiveStatusGatewayConfig } from './generated/options'
+import { LiveStatusGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/LiveStatusGatewayOptionsTypes'
 import { CorelibPubSubTypes, CorelibPubSubCollections } from '@sofie-automation/corelib/dist/pubsub'
 import { ParametersOfFunctionOrNever } from '@sofie-automation/server-core-integration/dist/lib/subscriptions'
 
diff --git a/packages/live-status-gateway/src/generated/options.ts b/packages/live-status-gateway/src/generated/options.ts
diff --git a/packages/mos-gateway/src/generated/devices.ts b/packages/mos-gateway/src/generated/devices.ts
diff --git a/packages/mos-gateway/src/generated/options.ts b/packages/mos-gateway/src/generated/options.ts
diff --git a/packages/mos-gateway/src/mosHandler.ts b/packages/mos-gateway/src/mosHandler.ts
@@ -34,8 +34,8 @@ import {
 	DEFAULT_MOS_TIMEOUT_TIME,
 	DEFAULT_MOS_HEARTBEAT_INTERVAL,
 } from '@sofie-automation/shared-lib/dist/core/constants'
-import { MosGatewayConfig } from './generated/options'
-import { MosDeviceConfig } from './generated/devices'
+import { MosGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayOptionsTypes'
+import { MosDeviceConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
 import { PeripheralDeviceForDevice } from '@sofie-automation/server-core-integration'
 import _ = require('underscore')
 import { MosStatusHandler } from './mosStatus/handler'
diff --git a/packages/mos-gateway/src/mosStatus/__tests__/diff.spec.ts b/packages/mos-gateway/src/mosStatus/__tests__/diff.spec.ts
@@ -5,7 +5,7 @@ import {
 	IngestRundownStatus,
 } from '@sofie-automation/shared-lib/dist/ingest/rundownStatus'
 import { diffStatuses, ItemStatusEntry, MOS_STATUS_UNKNOWN, StoryStatusEntry } from '../diff'
-import type { MosDeviceStatusesConfig } from '../../generated/devices'
+import type { MosDeviceStatusesConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
 import { IMOSObjectStatus } from '@mos-connection/connector'
 
 describe('diffStatuses', () => {
diff --git a/packages/mos-gateway/src/mosStatus/diff.ts b/packages/mos-gateway/src/mosStatus/diff.ts
@@ -1,5 +1,5 @@
 import { IMOSObjectStatus } from '@mos-connection/connector'
-import type { MosDeviceStatusesConfig } from '../generated/devices'
+import type { MosDeviceStatusesConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
 import {
 	IngestPartNotifyItemReady,
 	IngestPartPlaybackStatus,
diff --git a/packages/mos-gateway/src/mosStatus/handler.ts b/packages/mos-gateway/src/mosStatus/handler.ts
@@ -6,7 +6,7 @@ import {
 	type MosTypes,
 	type IMOSDevice,
 } from '@mos-connection/connector'
-import type { MosDeviceStatusesConfig } from '../generated/devices'
+import type { MosDeviceStatusesConfig } from '@sofie-automation/shared-lib/dist/generated/MosGatewayDevicesTypes'
 import type { CoreMosDeviceHandler } from '../CoreMosDeviceHandler'
 import {
 	assertNever,
diff --git a/packages/playout-gateway/src/coreHandler.ts b/packages/playout-gateway/src/coreHandler.ts
@@ -23,7 +23,7 @@ import { PLAYOUT_DEVICE_CONFIG } from './configManifest'
 import { BaseRemoteDeviceIntegration } from 'timeline-state-resolver/dist/service/remoteDeviceInstance'
 import { getVersions } from './versions'
 import { CoreConnectionChild } from '@sofie-automation/server-core-integration/dist/lib/CoreConnectionChild'
-import { PlayoutGatewayConfig } from './generated/options'
+import { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
 import { PeripheralDeviceCommandId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
 
 export interface CoreConfig {
diff --git a/packages/playout-gateway/src/generated/options.ts b/packages/playout-gateway/src/generated/options.ts
diff --git a/packages/playout-gateway/src/tsrHandler.ts b/packages/playout-gateway/src/tsrHandler.ts
@@ -37,7 +37,7 @@ import {
 	TimelineObjGeneric,
 } from '@sofie-automation/shared-lib/dist/core/model/Timeline'
 import { PLAYOUT_DEVICE_CONFIG } from './configManifest'
-import { PlayoutGatewayConfig } from './generated/options'
+import { PlayoutGatewayConfig } from '@sofie-automation/shared-lib/dist/generated/PlayoutGatewayConfigTypes'
 import {
 	assertNever,
 	getSchemaDefaultValues,
diff --git a/packages/scripts/schema-types.mjs b/packages/scripts/schema-types.mjs
@@ -22,7 +22,6 @@ try {
 		bannerComment: '',
 	})
 
-	await fs.writeFile('./playout-gateway/src/generated/options.ts', BANNER + '\n' + schema)
 	await fs.writeFile('./shared-lib/src/generated/PlayoutGatewayConfigTypes.ts', BANNER + '\n' + schema)
 } catch (e) {
 	console.error('Error while generating playout-gateway options.json, continuing...')
@@ -37,7 +36,6 @@ try {
 		bannerComment: '',
 	})
 
-	await fs.writeFile('./mos-gateway/src/generated/options.ts', BANNER + '\n' + schema)
 	await fs.writeFile('./shared-lib/src/generated/MosGatewayOptionsTypes.ts', BANNER + '\n' + schema)
 } catch (e) {
 	console.error('Error while generating mos-gateway options.json, continuing...')
@@ -50,7 +48,6 @@ try {
 		bannerComment: '',
 	})
 
-	await fs.writeFile('./mos-gateway/src/generated/devices.ts', BANNER + '\n' + schema)
 	await fs.writeFile('./shared-lib/src/generated/MosGatewayDevicesTypes.ts', BANNER + '\n' + schema)
 } catch (e) {
 	console.error('Error while generating mos-gateway devices.json, continuing...')
@@ -65,7 +62,6 @@ try {
 		bannerComment: '',
 	})
 
-	await fs.writeFile('./live-status-gateway/src/generated/options.ts', BANNER + '\n' + schema)
 	await fs.writeFile('./shared-lib/src/generated/LiveStatusGatewayOptionsTypes.ts', BANNER + '\n' + schema)
 } catch (e) {
 	console.error('Error while generating live-status-gateway options.json, continuing...')
