wip: fix local variable value propogation

companion/lib/Controls/ControlTypes/Button/Base.ts

@@ -75,7 +75,7 @@ export abstract class ButtonControlBase<TJson, TOptions extends Record<string, a
 				controlId,
 				commitChange: this.commitChange.bind(this),
 				triggerRedraw: this.triggerRedraw.bind(this),
-				localVariablesChanged: this.onVariablesChanged.bind(this),
+				localVariablesChanged: this.onLocalVariablesChanged.bind(this),
 				instanceDefinitions: deps.instance.definitions,
 				internalModule: deps.internalModule,
 				moduleHost: deps.instance.moduleHost,
@@ -208,6 +208,12 @@ export abstract class ButtonControlBase<TJson, TOptions extends Record<string, a
 		return result
 	}
 
+	onLocalVariablesChanged(allChangedVariables: Set<string>): void {
+		this.onVariablesChanged(allChangedVariables)
+
+		this.deps.internalModule.onVariablesChanged(allChangedVariables, this.controlId)
+	}
+
 	abstract onVariablesChanged(allChangedVariables: Set<string>): void
 
 	/**

companion/lib/Controls/ControlTypes/Triggers/Events/Variable.ts

@@ -39,6 +39,11 @@ export class TriggersEventVariables {
 	 */
 	readonly #eventBus: TriggerEvents
 
+	/**
+	 * The control id of the parent trigger
+	 */
+	readonly #controlId: string
+
 	/**
 	 * Execute the actions of the parent trigger
 	 */
@@ -62,6 +67,7 @@ export class TriggersEventVariables {
 		this.#logger = LogController.createLogger(`Controls/Triggers/Events/Timer/${controlId}`)
 
 		this.#eventBus = eventBus
+		this.#controlId = controlId
 		this.#executeActions = executeActions
 
 		this.#eventBus.on('variables_changed', this.#onVariablesChanged)
@@ -85,7 +91,10 @@ export class TriggersEventVariables {
 	 * Handler for the variable_changed event
 	 * @param allChangedVariables Set of all the variables that have changed
 	 */
-	#onVariablesChanged = (allChangedVariables: Set<string>): void => {
+	#onVariablesChanged = (allChangedVariables: Set<string>, fromControlId: string | null): void => {
+		// If the event is from a control, but not the same control, ignore it
+		if (fromControlId && fromControlId !== this.#controlId) return
+
 		if (this.#enabled) {
 			let execute = false
 

companion/lib/Controls/Controller.ts

@@ -957,12 +957,15 @@ export class ControlsController extends CoreBase {
 	/**
 	 * Propagate variable changes to the controls
 	 */
-	onVariablesChanged(allChangedVariablesSet: Set<string>): void {
+	onVariablesChanged(allChangedVariablesSet: Set<string>, fromControlId: string | null): void {
 		// Inform triggers of the change
-		this.triggers.emit('variables_changed', allChangedVariablesSet)
+		this.triggers.emit('variables_changed', allChangedVariablesSet, fromControlId)
 
 		if (allChangedVariablesSet.size > 0) {
 			for (const control of this.#controls.values()) {
+				// If the changes are local variables and from another control, ignore them
+				if (fromControlId && fromControlId !== control.controlId) continue
+
 				if (control.supportsStyle) {
 					control.onVariablesChanged(allChangedVariablesSet)
 				}

companion/lib/Controls/TriggerEvents.ts

@@ -10,7 +10,7 @@ interface TriggerEventsEvents {
 
 	trigger_enabled: [controlId: string, enabled: boolean]
 	control_press: [controlId: string, pressed: boolean, surfaceId: string | undefined]
-	variables_changed: [changed: Set<string>]
+	variables_changed: [changed: Set<string>, fromControlId: string | null]
 }
 
 /**

companion/lib/Internal/Controller.ts

@@ -525,13 +525,13 @@ export class InternalController {
 		this.#variablesController.definitions.setVariableDefinitions('internal', variables)
 	}
 
-	variablesChanged(all_changed_variables_set: Set<string>): void {
+	onVariablesChanged(changedVariablesSet: Set<string>, fromControlId: string | null): void {
 		if (!this.#initialized) throw new Error(`InternalController is not initialized`)
 
 		// Inform all fragments
 		for (const fragment of this.#fragments) {
-			if ('variablesChanged' in fragment && typeof fragment.variablesChanged === 'function') {
-				fragment.variablesChanged(all_changed_variables_set)
+			if (typeof fragment.onVariablesChanged === 'function') {
+				fragment.onVariablesChanged(changedVariablesSet, fromControlId)
 			}
 		}
 
@@ -542,7 +542,7 @@ export class InternalController {
 			if (!feedback.referencedVariables || !feedback.referencedVariables.length) continue
 
 			// Check a referenced variable was changed
-			if (!feedback.referencedVariables.some((variable) => all_changed_variables_set.has(variable))) continue
+			if (!feedback.referencedVariables.some((variable) => changedVariablesSet.has(variable))) continue
 
 			newValues.push({
 				id: id,

companion/lib/Internal/Types.ts

@@ -69,6 +69,8 @@ export interface InternalModuleFragment {
 
 	getVariableDefinitions?: () => VariableDefinitionTmp[]
 	updateVariables?: () => void
+
+	onVariablesChanged?: (changedVariablesSet: Set<string>, fromControlId: string | null) => void
 }
 
 export interface ExecuteFeedbackResultWithReferences {

companion/lib/Internal/Variables.ts

@@ -62,7 +62,7 @@ export class InternalVariables implements InternalModuleFragment {
 	/**
 	 * The dependencies of variables that should retrigger each feedback
 	 */
-	#variableSubscriptions = new Map<string, Set<string>>()
+	#variableSubscriptions = new Map<string, { controlId: string; variables: Set<string> }>()
 
 	constructor(internalModule: InternalController, controlsController: ControlsController) {
 		this.#internalModule = internalModule
@@ -170,7 +170,7 @@ export class InternalVariables implements InternalModuleFragment {
 				feedback
 			)
 
-			this.#variableSubscriptions.set(feedback.id, result.variableIds)
+			this.#variableSubscriptions.set(feedback.id, { controlId: feedback.controlId, variables: result.variableIds })
 
 			return compareValues(feedback.options.op, result.text, feedback.options.value)
 		} else if (feedback.definitionId == 'variable_variable') {
@@ -183,14 +183,17 @@ export class InternalVariables implements InternalModuleFragment {
 				feedback
 			)
 
-			this.#variableSubscriptions.set(feedback.id, new Set([...result1.variableIds, ...result2.variableIds]))
+			this.#variableSubscriptions.set(feedback.id, {
+				controlId: feedback.controlId,
+				variables: new Set([...result1.variableIds, ...result2.variableIds]),
+			})
 
 			return compareValues(feedback.options.op, result1.text, result2.text)
 		} else if (feedback.definitionId == 'check_expression') {
 			const parser = this.#controlsController.createVariablesAndExpressionParser(feedback.location, null)
 			const res = parser.executeExpression(feedback.options.expression, 'boolean')
 
-			this.#variableSubscriptions.set(feedback.id, res.variableIds)
+			this.#variableSubscriptions.set(feedback.id, { controlId: feedback.controlId, variables: res.variableIds })
 
 			if (res.ok) {
 				return !!res.value
@@ -210,23 +213,26 @@ export class InternalVariables implements InternalModuleFragment {
 	/**
 	 * Some variables have been changed
 	 */
-	variablesChanged(all_changed_variables_set: Set<string>): void {
+	onVariablesChanged(changedVariablesSet: Set<string>, fromControlId: string | null): void {
 		/**
 		 * Danger: It is important to not do any debounces here.
 		 * Doing so will cause triggers which are 'on variable change' with a condition to check the variable value to break
 		 */
 
-		const affected_ids: string[] = []
-		for (const [id, names] of this.#variableSubscriptions.entries()) {
-			for (const name of names) {
-				if (all_changed_variables_set.has(name)) {
-					affected_ids.push(id)
+		const affectedFeedbackIds: string[] = []
+		for (const [id, { controlId, variables }] of this.#variableSubscriptions.entries()) {
+			// Skip if the changes are local variables from a different control
+			if (fromControlId && controlId !== fromControlId) continue
+
+			for (const name of variables) {
+				if (changedVariablesSet.has(name)) {
+					affectedFeedbackIds.push(id)
 					break
 				}
 			}
 		}
-		if (affected_ids.length > 0) {
-			this.#internalModule.checkFeedbacksById(...affected_ids)
+		if (affectedFeedbackIds.length > 0) {
+			this.#internalModule.checkFeedbacksById(...affectedFeedbackIds)
 		}
 	}
 

companion/lib/Registry.ts

@@ -292,8 +292,8 @@ export class Registry {
 		})
 
 		this.variables.values.on('variables_changed', (all_changed_variables_set) => {
-			this.internalModule.variablesChanged(all_changed_variables_set)
-			this.controls.onVariablesChanged(all_changed_variables_set)
+			this.internalModule.onVariablesChanged(all_changed_variables_set, null)
+			this.controls.onVariablesChanged(all_changed_variables_set, null)
 			this.instance.moduleHost.onVariablesChanged(all_changed_variables_set)
 			this.#preview.onVariablesChanged(all_changed_variables_set)
 			this.surfaces.onVariablesChanged(all_changed_variables_set)