update types

Author: featherbear

eslint.config.mjs

@@ -25,6 +25,7 @@ export default tseslint.config(
             "prefer-const": "off",
             "prefer-spread": "off",
             "no-dupe-class-members": "off",
+            "no-extra-boolean-cast": "off",
             "space-before-function-paren": "off",
             "@typescript-eslint/no-duplicate-enum-values": "warn",
             "@typescript-eslint/no-explicit-any": "off",

src/actions/channels.ts

@@ -1,6 +1,6 @@
 
 import type { CompanionActionDefinition, CompanionActionDefinitions, DropdownChoice } from "@companion-module/base"
-import { ChannelSelector } from "presonus-studiolive-api"
+import type { ChannelSelector } from "presonus-studiolive-api"
 import type Instance from ".."
 import { generateTransitionPeriodOption } from "../util/actionsUtils"
 import { extractChannelSelector, generateChannelSelectOption, generateMixSelectOption } from "../util/channelUtils"
@@ -19,11 +19,12 @@ const withChannelSelector = function (fn: (
     }) satisfies CompanionActionDefinition['callback']
 }
 
+export type GeneratedChannelActions = ReturnType<typeof generateActions_channels>
 export default function generateActions_channels(this: Instance, channels: DropdownChoice[], mixes: DropdownChoice[]) {
     const channelSelectOptions = generateChannelSelectOption(channels)
     const mixSelectOptions = generateMixSelectOption(mixes, "Mix Target")
 
-    const map = {
+    const actions = {
         mute: {
             name: 'Mute channel',
             options: [
@@ -61,7 +62,7 @@ export default function generateActions_channels(this: Instance, channels: Dropd
                 mixSelectOptions,
                 generateTransitionPeriodOption(200)
             ], callback: withChannelSelector((action, context, channel) => {
-                let currentLevel = this.client.getLevel(channel)
+                const currentLevel = this.client.getLevel(channel)
                 this.client.setChannelVolumeLinear(channel, 0, <number>action.options.transition).then(() => {
                     this.client.mute(channel)
                     this.client.setChannelVolumeLinear(channel, currentLevel)
@@ -76,7 +77,7 @@ export default function generateActions_channels(this: Instance, channels: Dropd
                 mixSelectOptions,
                 generateTransitionPeriodOption(200)
             ], callback: withChannelSelector((action, context, channel) => {
-                let currentLevel = this.client.getLevel(channel)
+                const currentLevel = this.client.getLevel(channel)
 
                 this.client.setChannelVolumeLinear(channel, 0, 0).then(() => {
                     this.client.unmute(channel)
@@ -92,11 +93,11 @@ export default function generateActions_channels(this: Instance, channels: Dropd
                 mixSelectOptions,
                 generateTransitionPeriodOption(200)
             ], callback: withChannelSelector((action, context, channel) => {
-                const fn = this.client.getMute(channel) ? map.unmute_smooth : map.mute_smooth
+                const fn = this.client.getMute(channel) ? actions.unmute_smooth : actions.mute_smooth
                 fn.callback(action, context)
             }),
         }
     } satisfies CompanionActionDefinitions
 
-    return map
+    return actions
 }

src/actions/projectScenes.ts

@@ -1,5 +1,5 @@
-import { CompanionActionDefinitions, DropdownChoice } from "@companion-module/base";
-import Instance from "..";
+import type { CompanionActionDefinitions, DropdownChoice } from "@companion-module/base";
+import type Instance from "../";
 import { ValueSeparator } from "../util/Constants";
 
 export default function generateActions_projectScenes(this: Instance, project_scenes: DropdownChoice[]) {
@@ -18,7 +18,7 @@ export default function generateActions_projectScenes(this: Instance, project_sc
                 }
             ],
             callback: (action, context) => {
-                let [project, scene] = (<string>action.options[key]).split(ValueSeparator)
+                const [project, scene] = (<string>action.options[key]).split(ValueSeparator)
                 if (!project) return
 
                 if (scene) {

src/defaults.ts

@@ -1,4 +1,4 @@
-import { CompanionVariableDefinition } from '@companion-module/base'
+import type { CompanionVariableDefinition } from '@companion-module/base'
 import generateMixes from './mixes'
 import generateChannelSelectEntries from './util/channelUtils'
 

src/feedbacks.ts

@@ -18,6 +18,7 @@ const withChannelSelector = function <T>(fn: (
 
 }
 
+export type FeedbackDefinitions = ReturnType<typeof generateFeedback>
 export default function generateFeedback(this: Instance, channels: DropdownChoice[], mixes: DropdownChoice[]) {
     const channelSelectOptions = generateChannelSelectOption(channels)
     const mixSelectOptions = generateMixSelectOption(mixes, "Mix Source")
@@ -53,8 +54,11 @@ export default function generateFeedback(this: Instance, channels: DropdownChoic
                 let colour: string = this.client.getColour(channel)
                 if (!colour) return {};
 
-                const [R, G, B, A] = Buffer.from(colour, 'hex')
-                if (R + G + B == 0) return {};
+                const [R, G, B] = Buffer.from(colour, 'hex')
+                
+                // Black, set to empty
+                // perhaps we should set to black though?
+                if (R + G + B === 0) return {};
 
                 return {
                     bgcolor: combineRgb(R, G, B)