feat!: remove deprecated fields added for legacy module compatability

bitfocus · Oct 16, 2022 · a6d7d70 · a6d7d70
1 parent 297fac1
commit a6d7d70
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 69 deletions.
diff --git a/src/host-api/api.ts b/src/host-api/api.ts
@@ -144,9 +144,6 @@ export interface SetVariableValuesMessage {
 
 export interface ExecuteActionMessage {
 	action: ActionInstance
-
-	/** @deprecated */
-	deviceId: string | undefined
 }
 
 export interface UpdateFeedbackValuesMessage {
@@ -175,14 +172,6 @@ export interface FeedbackInstance extends FeedbackInstanceBase {
 		width: number
 		height: number
 	}
-
-	/** @deprecated */
-	page: number
-	/** @deprecated */
-	bank: number
-
-	/** @deprecated */
-	rawBank: any
 }
 
 export interface UpdateFeedbackInstancesMessage {
@@ -200,11 +189,6 @@ export interface ActionInstanceBase {
 }
 export interface ActionInstance extends ActionInstanceBase {
 	controlId: string
-
-	/** @deprecated */
-	page: number
-	/** @deprecated */
-	bank: number
 }
 
 export interface UpdateActionInstancesMessage {

diff --git a/src/internal/feedback.ts b/src/internal/feedback.ts
@@ -19,16 +19,12 @@ export function callFeedbackOnDefinition(definition: CompanionFeedbackDefinition
 		return definition.callback({
 			...convertFeedbackInstanceToEvent('boolean', feedback),
 			type: 'boolean',
-			_rawBank: feedback.rawBank,
 		})
 	} else {
 		return definition.callback({
 			...convertFeedbackInstanceToEvent('advanced', feedback),
 			type: 'advanced',
 			image: feedback.image,
-			_page: feedback.page,
-			_bank: feedback.bank,
-			_rawBank: feedback.rawBank,
 		})
 	}
 }
diff --git a/src/module-api/action.ts b/src/module-api/action.ts
@@ -75,13 +75,4 @@ export interface CompanionActionInfo {
 /**
  * Extended information for execution of an action
  */
-export interface CompanionActionEvent extends CompanionActionInfo {
-	// Future: the contents of this should be re-evaluated in v1
-
-	/** @deprecated */
-	readonly _deviceId: string | undefined
-	/** @deprecated */
-	readonly _page: number
-	/** @deprecated */
-	readonly _bank: number
-}
+export interface CompanionActionEvent extends CompanionActionInfo {}
diff --git a/src/module-api/base.ts b/src/module-api/base.ts
@@ -195,10 +195,6 @@ export abstract class InstanceBase<TConfig> implements InstanceBaseShared<TConfi
 			actionId: msg.action.actionId,
 			controlId: msg.action.controlId,
 			options: msg.action.options,
-
-			_deviceId: msg.deviceId,
-			_page: msg.action.page,
-			_bank: msg.action.bank,
 		})
 	}
 	private async _handleUpdateFeedbacks(msg: UpdateFeedbackInstancesMessage, skipUpgrades?: boolean): Promise<void> {
@@ -328,10 +324,6 @@ export abstract class InstanceBase<TConfig> implements InstanceBaseShared<TConfi
 				actionId: msg.action.actionId,
 				controlId: msg.action.controlId,
 				options: msg.action.options,
-
-				_deviceId: undefined,
-				_page: msg.action.page,
-				_bank: msg.action.bank,
 			})
 
 			return {
@@ -655,16 +647,6 @@ export abstract class InstanceBase<TConfig> implements InstanceBaseShared<TConfi
 		}
 	}
 
-	/** @deprecated */
-	_getAllActions() {
-		return Array.from(this.#actionInstances.values()).map((act) => ({
-			id: act.id,
-			actionId: act.actionId,
-			controlId: act.controlId,
-			options: act.options,
-		}))
-	}
-
 	/**
 	 * Call subscribe on all currently known placed actions.
 	 * It can be useful to trigger this upon establishing a connection, to ensure all data is loaded
@@ -712,16 +694,6 @@ export abstract class InstanceBase<TConfig> implements InstanceBaseShared<TConfi
 		}
 	}
 
-	/** @deprecated */
-	_getAllFeedbacks() {
-		return Array.from(this.#feedbackInstances.values()).map((fb) => ({
-			id: fb.id,
-			feedbackId: fb.feedbackId,
-			controlId: fb.controlId,
-			options: fb.options,
-		}))
-	}
-
 	/**
 	 * Call subscribe on all currently known placed feedbacks.
 	 * It can be useful to trigger this upon establishing a connection, to ensure all data is loaded

diff --git a/src/module-api/feedback.ts b/src/module-api/feedback.ts
@@ -40,9 +40,6 @@ export interface CompanionFeedbackInfo {
  */
 export interface CompanionFeedbackBooleanEvent extends CompanionFeedbackInfo {
 	// readonly type: 'boolean'
-
-	/** @deprecated */
-	readonly _rawBank: any
 }
 
 /**
@@ -56,14 +53,6 @@ export interface CompanionFeedbackAdvancedEvent extends CompanionFeedbackInfo {
 		readonly width: number
 		readonly height: number
 	}
-
-	/** @deprecated */
-	readonly _page: number
-	/** @deprecated */
-	readonly _bank: number
-
-	/** @deprecated */
-	readonly _rawBank: any
 }
 
 /**