@companion-module/base 1.14.1 → 1.99.0-1-nightly-feat-2-0-20260118-141645-897e0fe

package/dist/module-api/base.js

@@ -1,31 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstanceBase = void 0;
-const tslib_1 = require("tslib");
-const util_js_1 = require("../util.js");
-const p_queue_1 = tslib_1.__importDefault(require("p-queue"));
-const base_js_1 = require("../internal/base.js");
-const upgrade_js_1 = require("../internal/upgrade.js");
-const feedback_js_1 = require("../internal/feedback.js");
-const ipc_wrapper_js_1 = require("../host-api/ipc-wrapper.js");
-const actions_js_1 = require("../internal/actions.js");
-const shared_udp_socket_js_1 = require("./shared-udp-socket.js");
-class InstanceBase {
-    #ipcWrapper;
-    #upgradeScripts;
-    id;
-    #lifecycleQueue = new p_queue_1.default({ concurrency: 1 });
-    #initialized = false;
-    #recordingActions = false;
-    #lastConfig = {};
-    #lastSecrets = {};
-    #actionManager;
-    #feedbackManager;
-    #sharedUdpSocketHandlers = new Map();
-    #variableDefinitions = new Map();
-    #variableValues = new Map();
+import { createModuleLogger } from '../logging.js';
+import { assertNever } from '../util.js';
+import { SharedUdpSocketImpl, } from './shared-udp-socket.js';
+import { isInstanceContext } from '../host-api/context.js';
+export class InstanceBase {
+    #context;
+    #logger;
     #options;
-    #label;
+    get id() {
+        return this.#context.id;
+    }
     get instanceOptions() {
         return this.#options;
     }
@@ -34,307 +17,60 @@ class InstanceBase {
      * This can be changed just before `configUpdated` is called
      */
     get label() {
-        return this.#label;
+        return this.#context.label;
     }
     /**
      * Create an instance of the module
      */
     constructor(internal) {
-        if (!(0, base_js_1.isInstanceBaseProps)(internal) || !internal._isInstanceBaseProps)
+        if (!isInstanceContext(internal) || !internal._isInstanceContext)
             throw new Error(`Module instance is being constructed incorrectly. Make sure you aren't trying to do this manually`);
+        this.#context = internal;
+        this.#logger = createModuleLogger();
         this.createSharedUdpSocket = this.createSharedUdpSocket.bind(this);
         this.#options = {
             disableVariableValidation: false,
             disableNewConfigLayout: false,
         };
-        this.#ipcWrapper = new ipc_wrapper_js_1.IpcWrapper({
-            init: this._handleInit.bind(this),
-            destroy: this._handleDestroy.bind(this),
-            updateConfigAndLabel: this._handleConfigUpdateAndLabel.bind(this),
-            updateConfig: async () => undefined, // Replaced by updateConfigAndLabel
-            executeAction: this._handleExecuteAction.bind(this),
-            updateFeedbacks: this._handleUpdateFeedbacks.bind(this),
-            updateActions: this._handleUpdateActions.bind(this),
-            upgradeActionsAndFeedbacks: this._handleUpgradeActionsAndFeedbacks.bind(this),
-            getConfigFields: this._handleGetConfigFields.bind(this),
-            handleHttpRequest: this._handleHttpRequest.bind(this),
-            learnAction: this._handleLearnAction.bind(this),
-            learnFeedback: this._handleLearnFeedback.bind(this),
-            startStopRecordActions: this._handleStartStopRecordActions.bind(this),
-            variablesChanged: async () => undefined, // Not needed since 1.13.0
-            sharedUdpSocketMessage: this._handleSharedUdpSocketMessage.bind(this),
-            sharedUdpSocketError: this._handleSharedUdpSocketError.bind(this),
-        }, (msg) => {
-            process.send(msg);
-        }, 5000);
-        process.on('message', (msg) => {
-            this.#ipcWrapper.receivedMessage(msg);
-        });
-        const parseVariablesInStringIfNeeded = async (msg) => {
-            // Shortcut in case there is definitely nothing to parse
-            if (!msg.text.includes('$('))
-                return {
-                    text: msg.text,
-                    variableIds: undefined,
-                };
-            return this.#ipcWrapper.sendWithCb('parseVariablesInString', msg);
-        };
-        this.#actionManager = new actions_js_1.ActionManager(parseVariablesInStringIfNeeded, (msg) => this.#ipcWrapper.sendWithNoCb('setActionDefinitions', msg), (msg) => this.#ipcWrapper.sendWithNoCb('setCustomVariable', msg), this.log.bind(this));
-        this.#feedbackManager = new feedback_js_1.FeedbackManager(parseVariablesInStringIfNeeded, (msg) => this.#ipcWrapper.sendWithNoCb('updateFeedbackValues', msg), (msg) => this.#ipcWrapper.sendWithNoCb('setFeedbackDefinitions', msg), this.log.bind(this));
-        this.#upgradeScripts = internal.upgradeScripts;
-        this.id = internal.id;
-        this.#label = internal.id; // Temporary
         this.log('debug', 'Initializing');
     }
-    async _handleInit(msg) {
-        return this.#lifecycleQueue.add(async () => {
-            if (this.#initialized)
-                throw new Error('Already initialized');
-            this.#lastConfig = msg.config;
-            this.#lastSecrets = msg.secrets;
-            this.#label = msg.label;
-            process.title = msg.label;
-            // Create initial config object
-            if (msg.isFirstInit) {
-                const newConfig = {};
-                const newSecrets = {};
-                const fields = this.getConfigFields();
-                for (const field of fields) {
-                    if ('default' in field) {
-                        if (field.type.startsWith('secret')) {
-                            newSecrets[field.id] = field.default;
-                        }
-                        else {
-                            newConfig[field.id] = field.default;
-                        }
-                    }
-                }
-                this.#lastConfig = newConfig;
-                this.#lastSecrets = newSecrets;
-                this.saveConfig(this.#lastConfig, this.#lastSecrets);
-                // this is new, so there is no point attempting to run any upgrade scripts
-                msg.lastUpgradeIndex = this.#upgradeScripts.length - 1;
-            }
-            /**
-             * Making this handle actions/feedbacks is hard now due to the structure of options, so instead we just upgrade the config, and the actions/feedbacks will be handled in their own calls soon after this
-             */
-            const { updatedConfig, updatedSecrets } = (0, upgrade_js_1.runThroughUpgradeScripts)([], [], msg.lastUpgradeIndex, this.#upgradeScripts, this.#lastConfig, this.#lastSecrets, false);
-            this.#lastConfig = updatedConfig ?? this.#lastConfig;
-            this.#lastSecrets = updatedSecrets ?? this.#lastSecrets;
-            // Now we can initialise the module
-            try {
-                await this.init(this.#lastConfig, !!msg.isFirstInit, this.#lastSecrets);
-                this.#initialized = true;
-            }
-            catch (e) {
-                console.trace(`Init failed: ${e}`);
-                throw e;
-            }
-            return {
-                hasHttpHandler: typeof this.handleHttpRequest === 'function',
-                hasRecordActionsHandler: typeof this.handleStartStopRecordActions == 'function',
-                newUpgradeIndex: this.#upgradeScripts.length - 1,
-                disableNewConfigLayout: this.#options.disableNewConfigLayout,
-                updatedConfig: this.#lastConfig,
-                updatedSecrets: this.#lastSecrets,
-            };
-        });
-    }
-    async _handleDestroy() {
-        await this.#lifecycleQueue.add(async () => {
-            if (!this.#initialized)
-                throw new Error('Not initialized');
-            await this.destroy();
-            this.#initialized = false;
-        });
-    }
-    async _handleConfigUpdateAndLabel(msg) {
-        await this.#lifecycleQueue.add(async () => {
-            if (!this.#initialized)
-                throw new Error('Not initialized');
-            this.#label = msg.label;
-            process.title = msg.label;
-            this.#lastConfig = msg.config;
-            this.#lastSecrets = msg.secrets;
-            await this.configUpdated(this.#lastConfig, this.#lastSecrets);
-        });
-    }
-    async _handleExecuteAction(msg) {
-        return this.#actionManager.handleExecuteAction(msg);
-    }
-    async _handleUpdateFeedbacks(msg) {
-        this.#feedbackManager.handleUpdateFeedbacks(msg.feedbacks);
-    }
-    async _handleUpdateActions(msg) {
-        this.#actionManager.handleUpdateActions(msg.actions);
-    }
-    async _handleUpgradeActionsAndFeedbacks(msg) {
-        return (0, upgrade_js_1.runThroughUpgradeScripts)(msg.actions, msg.feedbacks, null, this.#upgradeScripts, this.#lastConfig, this.#lastSecrets, true);
-    }
-    async _handleGetConfigFields(_msg) {
-        return {
-            fields: (0, base_js_1.serializeIsVisibleFn)(this.getConfigFields()),
-        };
-    }
-    async _handleHttpRequest(msg) {
-        if (!this.handleHttpRequest)
-            throw new Error(`handleHttpRequest is not supported!`);
-        const res = await this.handleHttpRequest(msg.request);
-        return { response: res };
-    }
-    async _handleLearnAction(msg) {
-        return this.#actionManager.handleLearnAction(msg);
-    }
-    async _handleLearnFeedback(msg) {
-        return this.#feedbackManager.handleLearnFeedback(msg);
-    }
-    async _handleStartStopRecordActions(msg) {
-        if (!msg.recording) {
-            if (!this.#recordingActions) {
-                // Already stopped
-                return;
-            }
-        }
-        else {
-            if (this.#recordingActions) {
-                // Already running
-                return;
-            }
-        }
-        if (!this.handleStartStopRecordActions) {
-            this.#recordingActions = false;
-            throw new Error('Recording actions is not supported by this module!');
-        }
-        this.#recordingActions = msg.recording;
-        this.handleStartStopRecordActions(this.#recordingActions);
-    }
-    async _handleSharedUdpSocketMessage(msg) {
-        for (const socket of this.#sharedUdpSocketHandlers.values()) {
-            if (socket.handleId === msg.handleId) {
-                socket.receiveSocketMessage(msg);
-            }
-        }
-    }
-    async _handleSharedUdpSocketError(msg) {
-        for (const socket of this.#sharedUdpSocketHandlers.values()) {
-            if (socket.handleId === msg.handleId) {
-                socket.receiveSocketError(msg.error);
-            }
-        }
-    }
     saveConfig(newConfig, newSecrets) {
-        if (newConfig)
-            this.#lastConfig = newConfig;
-        if (newSecrets)
-            this.#lastSecrets = newSecrets;
-        this.#ipcWrapper.sendWithNoCb('saveConfig', { config: newConfig, secrets: newSecrets });
+        this.#context.saveConfig(newConfig, newSecrets);
     }
     /**
      * Set the action definitions for this instance
      * @param actions The action definitions
      */
     setActionDefinitions(actions) {
-        this.#actionManager.setActionDefinitions(actions);
+        this.#context.setActionDefinitions(actions);
     }
     /**
      * Set the feedback definitions for this instance
      * @param feedbacks The feedback definitions
      */
     setFeedbackDefinitions(feedbacks) {
-        this.#feedbackManager.setFeedbackDefinitions(feedbacks);
+        this.#context.setFeedbackDefinitions(feedbacks);
     }
     /**
      * Set the peset definitions for this instance
      * @param presets The preset definitions
      */
     setPresetDefinitions(presets) {
-        const hostPresets = [];
-        for (const [id, preset] of Object.entries(presets)) {
-            if (preset) {
-                hostPresets.push({
-                    ...preset,
-                    id,
-                });
-            }
-        }
-        this.#ipcWrapper.sendWithNoCb('setPresetDefinitions', { presets: hostPresets });
+        this.#context.setPresetDefinitions(presets);
     }
     /**
      * Set the variable definitions for this instance
      * @param variables The variable definitions
      */
     setVariableDefinitions(variables) {
-        const hostVariables = [];
-        const hostValues = [];
-        this.#variableDefinitions.clear();
-        for (const variable of variables) {
-            hostVariables.push({
-                id: variable.variableId,
-                name: variable.name,
-            });
-            // Remember the definition locally
-            this.#variableDefinitions.set(variable.variableId, variable);
-            if (!this.#variableValues.has(variable.variableId)) {
-                // Give us a local cached value of something
-                this.#variableValues.set(variable.variableId, '');
-                hostValues.push({
-                    id: variable.variableId,
-                    value: '',
-                });
-            }
-        }
-        if (!this.#options.disableVariableValidation) {
-            const validIds = new Set(this.#variableDefinitions.keys());
-            for (const id of this.#variableValues.keys()) {
-                if (!validIds.has(id)) {
-                    // Delete any local cached value
-                    this.#variableValues.delete(id);
-                    hostValues.push({
-                        id: id,
-                        value: undefined,
-                    });
-                }
-            }
-        }
-        this.#ipcWrapper.sendWithNoCb('setVariableDefinitions', { variables: hostVariables, newValues: hostValues });
+        this.#context.setVariableDefinitions(variables);
     }
     /**
      * Set the values of some variables
      * @param values The new values for the variables
      */
     setVariableValues(values) {
-        const hostValues = [];
-        for (const [variableId, value] of Object.entries(values)) {
-            if (this.#options.disableVariableValidation) {
-                // update the cached value
-                if (value === undefined) {
-                    this.#variableValues.delete(variableId);
-                }
-                else {
-                    this.#variableValues.set(variableId, value);
-                }
-                hostValues.push({
-                    id: variableId,
-                    value: value,
-                });
-            }
-            else if (this.#variableDefinitions.has(variableId)) {
-                // update the cached value
-                this.#variableValues.set(variableId, value ?? '');
-                hostValues.push({
-                    id: variableId,
-                    value: value ?? '',
-                });
-            }
-            else {
-                // tell companion to delete the value
-                hostValues.push({
-                    id: variableId,
-                    value: undefined,
-                });
-            }
-        }
-        this.#ipcWrapper.sendWithNoCb('setVariableValues', { newValues: hostValues });
+        this.#context.setVariableValues(values);
     }
     /**
      * Get the last set value of a variable from this connection
@@ -342,47 +78,32 @@ class InstanceBase {
      * @returns The value
      */
     getVariableValue(variableId) {
-        return this.#variableValues.get(variableId);
+        return this.#context.getVariableValue(variableId);
     }
     /**
      * @deprecated Companion now handles this for you, for actions and feedbacks. If you need this for another purpose, let us know as we intend to remove this
      *
      * Parse and replace all the variables in a string
      * Note: You must not use this for feedbacks, as your feedback will not update when the variable changes.
-     * There is an alternate version of this supplied to each of the action/feedback callbacks that tracks
-     * usages properly and will retrigger the feedback when the variables change.
      * @param text The text to parse
      * @returns The string with variables replaced with their values
      */
     async parseVariablesInString(text) {
-        const currentContext = this.#feedbackManager.parseVariablesContext;
-        if (currentContext) {
-            this.log('debug', `parseVariablesInString called while in: ${currentContext}. You should use the parseVariablesInString provided to the callback instead`);
-        }
-        // If there are no variables, just return the text
-        if (!text.includes('$('))
-            return text;
-        const res = await this.#ipcWrapper.sendWithCb('parseVariablesInString', {
-            text: text,
-            controlId: undefined,
-            actionInstanceId: undefined,
-            feedbackInstanceId: undefined,
-        });
-        return res.text;
+        return this.#context.parseVariablesInString(text);
     }
     /**
      * Request all feedbacks of the specified types to be checked for changes
      * @param feedbackTypes The feedback types to check
      */
     checkFeedbacks(...feedbackTypes) {
-        this.#feedbackManager.checkFeedbacks(feedbackTypes);
+        this.#context.checkFeedbacks(feedbackTypes);
     }
     /**
      * Request the specified feedback instances to be checked for changes
      * @param feedbackIds The ids of the feedback instances to check
      */
     checkFeedbacksById(...feedbackIds) {
-        this.#feedbackManager.checkFeedbacksById(feedbackIds);
+        this.#context.checkFeedbacksById(feedbackIds);
     }
     /**
      * Call subscribe on all currently known placed actions.
@@ -390,7 +111,7 @@ class InstanceBase {
      * @param actionIds The actionIds to call subscribe for. If no values are provided, then all are called.
      */
     subscribeActions(...actionIds) {
-        this.#actionManager.subscribeActions(actionIds);
+        this.#context.subscribeActions(actionIds);
     }
     /**
      * Call unsubscribe on all currently known placed actions.
@@ -398,7 +119,7 @@ class InstanceBase {
      * @param actionIds The actionIds to call subscribe for. If no values are provided, then all are called.
      */
     unsubscribeActions(...actionIds) {
-        this.#actionManager.unsubscribeActions(actionIds);
+        this.#context.unsubscribeActions(actionIds);
     }
     /**
      * Call subscribe on all currently known placed feedbacks.
@@ -406,7 +127,7 @@ class InstanceBase {
      * @param feedbackIds The feedbackIds to call subscribe for. If no values are provided, then all are called.
      */
     subscribeFeedbacks(...feedbackIds) {
-        this.#feedbackManager.subscribeFeedbacks(feedbackIds);
+        this.#context.subscribeFeedbacks(feedbackIds);
     }
     /**
      * Call unsubscribe on all currently known placed feedbacks.
@@ -414,7 +135,7 @@ class InstanceBase {
      * @param feedbackIds The feedbackIds to call subscribe for. If no values are provided, then all are called.
      */
     unsubscribeFeedbacks(...feedbackIds) {
-        this.#feedbackManager.unsubscribeFeedbacks(feedbackIds);
+        this.#context.unsubscribeFeedbacks(feedbackIds);
     }
     /**
      * Add an action to the current recording session
@@ -422,14 +143,7 @@ class InstanceBase {
      * @param uniquenessId A unique id for the action being recorded. This should be different for each action, but by passing the same as a previous call will replace the previous value.
      */
     recordAction(action, uniquenessId) {
-        if (!this.#recordingActions)
-            throw new Error('Not currently recording actions');
-        this.#ipcWrapper.sendWithNoCb('recordAction', {
-            uniquenessId: uniquenessId ?? null,
-            actionId: action.actionId,
-            options: action.options,
-            delay: action.delay,
-        });
+        this.#context.recordAction(action, uniquenessId);
     }
     /**
      * Send an osc message from the system osc sender
@@ -439,12 +153,7 @@ class InstanceBase {
      * @param args mesage arguments
      */
     oscSend(host, port, path, args) {
-        this.#ipcWrapper.sendWithNoCb('send-osc', (0, util_js_1.literal)({
-            host,
-            port,
-            path,
-            args,
-        }));
+        this.#context.oscSend(host, port, path, args);
     }
     /**
      * Update the status of this connection
@@ -457,10 +166,7 @@ class InstanceBase {
      * ```
      */
     updateStatus(status, message) {
-        this.#ipcWrapper.sendWithNoCb('set-status', (0, util_js_1.literal)({
-            status,
-            message: message ?? null,
-        }));
+        this.#context.updateStatus(status, message ?? null);
     }
     /**
      * Write a line to the log
@@ -468,18 +174,31 @@ class InstanceBase {
      * @param message The message text to write
      */
     log(level, message) {
-        this.#ipcWrapper.sendWithNoCb('log-message', (0, util_js_1.literal)({
-            level,
-            message,
-        }));
+        switch (level) {
+            case 'debug':
+                this.#logger.debug(message);
+                break;
+            case 'info':
+                this.#logger.info(message);
+                break;
+            case 'warn':
+                this.#logger.warn(message);
+                break;
+            case 'error':
+                this.#logger.error(message);
+                break;
+            default:
+                assertNever(level);
+                this.#logger.info(message);
+                break;
+        }
     }
     createSharedUdpSocket(typeOrOptions, callback) {
         const options = typeof typeOrOptions === 'string' ? { type: typeOrOptions } : typeOrOptions;
-        const socket = new shared_udp_socket_js_1.SharedUdpSocketImpl(this.#ipcWrapper, this.#sharedUdpSocketHandlers, options);
+        const socket = new SharedUdpSocketImpl(this.#context, options);
         if (callback)
             socket.on('message', callback);
         return socket;
     }
 }
-exports.InstanceBase = InstanceBase;
 //# sourceMappingURL=base.js.map

package/dist/module-api/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/module-api/base.ts"],"names":[],"mappings":";;;;AAoCA,wCAAoC;AAEpC,8DAA4B;AAK5B,iDAA+E;AAC/E,uDAAiE;AACjE,yDAAyD;AAEzD,+DAAuD;AACvD,uDAAsD;AACtD,iEAK+B;AAoB/B,MAAsB,YAAY;IACxB,WAAW,CAAwD;IACnE,eAAe,CAAmD;IAC3D,EAAE,CAAQ;IAEjB,eAAe,GAAW,IAAI,iBAAM,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAA;IACjE,YAAY,GAAG,KAAK,CAAA;IACpB,iBAAiB,GAAG,KAAK,CAAA;IAEzB,WAAW,GAAY,EAAS,CAAA;IAChC,YAAY,GAAa,EAAS,CAAA;IAEzB,cAAc,CAAe;IAC7B,gBAAgB,CAAiB;IAEjC,wBAAwB,GAAG,IAAI,GAAG,EAA+B,CAAA;IACjE,oBAAoB,GAAG,IAAI,GAAG,EAAuC,CAAA;IAErE,eAAe,GAAG,IAAI,GAAG,EAAkC,CAAA;IAE3D,QAAQ,CAAqB;IACtC,MAAM,CAAQ;IAEd,IAAW,eAAe;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC;IAED;;;OAGG;IACH,IAAW,KAAK;QACf,OAAO,IAAI,CAAC,MAAM,CAAA;IACnB,CAAC;IAED;;OAEG;IACH,YAAY,QAAiB;QAC5B,IAAI,CAAC,IAAA,6BAAmB,EAAoB,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB;YACtF,MAAM,IAAI,KAAK,CACd,mGAAmG,CACnG,CAAA;QAEF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAElE,IAAI,CAAC,QAAQ,GAAG;YACf,yBAAyB,EAAE,KAAK;YAChC,sBAAsB,EAAE,KAAK;SAC7B,CAAA;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,2BAAU,CAChC;YACC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;YACjC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACvC,oBAAoB,EAAE,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;YACjE,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,mCAAmC;YACxE,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YACnD,eAAe,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC;YACvD,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YACnD,0BAA0B,EAAE,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC7E,eAAe,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC;YACvD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;YACrD,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/C,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YACnD,sBAAsB,EAAE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC;YACrE,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS,EAAE,0BAA0B;YACnE,sBAAsB,EAAE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC;YACrE,oBAAoB,EAAE,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;SACjE,EACD,CAAC,GAAG,EAAE,EAAE;YACP,OAAO,CAAC,IAAK,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC,EACD,IAAI,CACJ,CAAA;QACD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAU,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;QAEF,MAAM,8BAA8B,GAAG,KAAK,EAC3C,GAAkC,EACe,EAAE;YACnD,wDAAwD;YACxD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC3B,OAAO;oBACN,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,WAAW,EAAE,SAAS;iBACtB,CAAA;YACF,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAA;QAClE,CAAC,CAAA;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,0BAAa,CACtC,8BAA8B,EAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,sBAAsB,EAAE,GAAG,CAAC,EACnE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,mBAAmB,EAAE,GAAG,CAAC,EAChE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CACnB,CAAA;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,6BAAe,CAC1C,8BAA8B,EAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,sBAAsB,EAAE,GAAG,CAAC,EACnE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,wBAAwB,EAAE,GAAG,CAAC,EACrE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CACnB,CAAA;QAED,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAA;QAC9C,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAA,CAAC,YAAY;QAEtC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,GAAgB;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1C,IAAI,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;YAE7D,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,MAAiB,CAAA;YACxC,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,OAAmB,CAAA;YAC3C,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,CAAA;YACvB,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;YAEzB,+BAA+B;YAC/B,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,SAAS,GAAQ,EAAE,CAAA;gBACzB,MAAM,UAAU,GAAQ,EAAE,CAAA;gBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;gBACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC5B,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;wBACxB,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;4BACrC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAA;wBACrC,CAAC;6BAAM,CAAC;4BACP,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAA;wBACpC,CAAC;oBACF,CAAC;gBACF,CAAC;gBACD,IAAI,CAAC,WAAW,GAAG,SAAoB,CAAA;gBACvC,IAAI,CAAC,YAAY,GAAG,UAAsB,CAAA;gBAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;gBAEpD,0EAA0E;gBAC1E,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAA;YACvD,CAAC;YAED;;eAEG;YACH,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,IAAA,qCAAwB,EACjE,EAAE,EACF,EAAE,EACF,GAAG,CAAC,gBAAgB,EACpB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,KAAK,CACL,CAAA;YACD,IAAI,CAAC,WAAW,GAAI,aAAqC,IAAI,IAAI,CAAC,WAAW,CAAA;YAC7E,IAAI,CAAC,YAAY,GAAI,cAAuC,IAAI,IAAI,CAAC,YAAY,CAAA;YAEjF,mCAAmC;YACnC,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;gBAEvE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACzB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;gBAClC,MAAM,CAAC,CAAA;YACR,CAAC;YAED,OAAO;gBACN,cAAc,EAAE,OAAO,IAAI,CAAC,iBAAiB,KAAK,UAAU;gBAC5D,uBAAuB,EAAE,OAAO,IAAI,CAAC,4BAA4B,IAAI,UAAU;gBAC/E,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;gBAChD,sBAAsB,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB;gBAC5D,aAAa,EAAE,IAAI,CAAC,WAAW;gBAC/B,cAAc,EAAE,IAAI,CAAC,YAAY;aACjC,CAAA;QACF,CAAC,CAAC,CAAA;IACH,CAAC;IACO,KAAK,CAAC,cAAc;QAC3B,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAE1D,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YAEpB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QAC1B,CAAC,CAAC,CAAA;IACH,CAAC;IACO,KAAK,CAAC,2BAA2B,CAAC,GAAgC;QACzE,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAE1D,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,CAAA;YACvB,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;YACzB,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,MAAiB,CAAA;YACxC,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,OAAmB,CAAA;YAE3C,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACH,CAAC;IACO,KAAK,CAAC,oBAAoB,CAAC,GAAyB;QAC3D,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;IACpD,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,GAAmC;QACvE,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC3D,CAAC;IACO,KAAK,CAAC,oBAAoB,CAAC,GAAiC;QACnE,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrD,CAAC;IACO,KAAK,CAAC,iCAAiC,CAC9C,GAA6C;QAE7C,OAAO,IAAA,qCAAwB,EAC9B,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,SAAS,EACb,IAAI,EACJ,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CACJ,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,IAA4B;QAChE,OAAO;YACN,MAAM,EAAE,IAAA,8BAAoB,EAAC,IAAI,CAAC,eAAe,EAAE,CAAC;SACpD,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,GAA6B;QAC7D,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QAEnF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAErD,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;IACzB,CAAC;IACO,KAAK,CAAC,kBAAkB,CAAC,GAAuB;QACvD,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAClD,CAAC;IACO,KAAK,CAAC,oBAAoB,CAAC,GAAyB;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;IACtD,CAAC;IACO,KAAK,CAAC,6BAA6B,CAAC,GAAkC;QAC7E,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,kBAAkB;gBAClB,OAAM;YACP,CAAC;QACF,CAAC;aAAM,CAAC;YACP,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC5B,kBAAkB;gBAClB,OAAM;YACP,CAAC;QACF,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACxC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAA;YAC9B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACtE,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAA;QAEtC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC1D,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAAC,GAA2B;QACtE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7D,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACtC,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAA;YACjC,CAAC;QACF,CAAC;IACF,CAAC;IACO,KAAK,CAAC,2BAA2B,CAAC,GAAyB;QAClE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7D,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACtC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACrC,CAAC;QACF,CAAC;IACF,CAAC;IA+BD,UAAU,CAAC,SAA8B,EAAE,UAAgC;QAC1E,IAAI,SAAS;YAAE,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAC3C,IAAI,UAAU;YAAE,IAAI,CAAC,YAAY,GAAG,UAAU,CAAA;QAC9C,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;IACxF,CAAC;IAmBD;;;OAGG;IACH,oBAAoB,CAAC,OAAmC;QACvD,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,SAAuC;QAC7D,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA;IACxD,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,OAAmC;QACvD,MAAM,WAAW,GAA2C,EAAE,CAAA;QAE9D,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,MAAM,EAAE,CAAC;gBACZ,WAAW,CAAC,IAAI,CAAC;oBAChB,GAAG,MAAM;oBACT,EAAE;iBACF,CAAC,CAAA;YACH,CAAC;QACF,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,sBAAsB,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAA;IAChF,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,SAAwC;QAC9D,MAAM,aAAa,GAA+C,EAAE,CAAA;QACpE,MAAM,UAAU,GAA+C,EAAE,CAAA;QAEjE,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAA;QAEjC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,aAAa,CAAC,IAAI,CAAC;gBAClB,EAAE,EAAE,QAAQ,CAAC,UAAU;gBACvB,IAAI,EAAE,QAAQ,CAAC,IAAI;aACnB,CAAC,CAAA;YAEF,kCAAkC;YAClC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YAC5D,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpD,4CAA4C;gBAC5C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;gBACjD,UAAU,CAAC,IAAI,CAAC;oBACf,EAAE,EAAE,QAAQ,CAAC,UAAU;oBACvB,KAAK,EAAE,EAAE;iBACT,CAAC,CAAA;YACH,CAAC;QACF,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1D,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBACvB,gCAAgC;oBAChC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;oBAC/B,UAAU,CAAC,IAAI,CAAC;wBACf,EAAE,EAAE,EAAE;wBACN,KAAK,EAAE,SAAS;qBAChB,CAAC,CAAA;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,wBAAwB,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAA;IAC7G,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,MAA+B;QAChD,MAAM,UAAU,GAA0C,EAAE,CAAA;QAE5D,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;gBAC7C,0BAA0B;gBAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;gBACxC,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;gBAC5C,CAAC;gBAED,UAAU,CAAC,IAAI,CAAC;oBACf,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,KAAK;iBACZ,CAAC,CAAA;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtD,0BAA0B;gBAC1B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAA;gBAEjD,UAAU,CAAC,IAAI,CAAC;oBACf,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,KAAK,IAAI,EAAE;iBAClB,CAAC,CAAA;YACH,CAAC;iBAAM,CAAC;gBACP,qCAAqC;gBACrC,UAAU,CAAC,IAAI,CAAC;oBACf,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,SAAS;iBAChB,CAAC,CAAA;YACH,CAAC;QACF,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,UAAkB;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,sBAAsB,CAAC,IAAY;QACxC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAA;QAClE,IAAI,cAAc,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CACP,OAAO,EACP,2CAA2C,cAAc,8EAA8E,CACvI,CAAA;QACF,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAA;QAErC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,wBAAwB,EAAE;YACvE,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,SAAS;YAC3B,kBAAkB,EAAE,SAAS;SAC7B,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,IAAI,CAAA;IAChB,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,GAAG,aAAuB;QACxC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;IACpD,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAAC,GAAG,WAAqB;QAC1C,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;IACtD,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,GAAG,SAAmB;QACtC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAChD,CAAC;IACD;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,SAAmB;QACxC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAClD,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,WAAqB;QAC1C,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;IACtD,CAAC;IACD;;;;OAIG;IACH,oBAAoB,CAAC,GAAG,WAAqB;QAC5C,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;IACxD,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,MAA+B,EAAE,YAAqB;QAClE,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAE/E,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,cAAc,EAAE;YAC7C,YAAY,EAAE,YAAY,IAAI,IAAI;YAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,KAAK,EAAE,MAAM,CAAC,KAAK;SACnB,CAAC,CAAA;IACH,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAsB;QACvE,IAAI,CAAC,WAAW,CAAC,YAAY,CAC5B,UAAU,EACV,IAAA,iBAAO,EAAiB;YACvB,IAAI;YACJ,IAAI;YACJ,IAAI;YACJ,IAAI;SACJ,CAAC,CACF,CAAA;IACF,CAAC;IAED;;;;;;;;;OASG;IACH,YAAY,CAAC,MAAsB,EAAE,OAAuB;QAC3D,IAAI,CAAC,WAAW,CAAC,YAAY,CAC5B,YAAY,EACZ,IAAA,iBAAO,EAAmB;YACzB,MAAM;YACN,OAAO,EAAE,OAAO,IAAI,IAAI;SACxB,CAAC,CACF,CAAA;IACF,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,KAAe,EAAE,OAAe;QACnC,IAAI,CAAC,WAAW,CAAC,YAAY,CAC5B,aAAa,EACb,IAAA,iBAAO,EAAoB;YAC1B,KAAK;YACL,OAAO;SACP,CAAC,CACF,CAAA;IACF,CAAC;IAYD,qBAAqB,CACpB,aAAuD,EACvD,QAAyC;QAEzC,MAAM,OAAO,GAA2B,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAA;QAEnH,MAAM,MAAM,GAAG,IAAI,0CAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAA;QAChG,IAAI,QAAQ;YAAE,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QAE5C,OAAO,MAAM,CAAA;IACd,CAAC;CACD;AAxnBD,oCAwnBC"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/module-api/base.ts"],"names":[],"mappings":"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"}

package/dist/module-api/common.d.ts

@@ -3,9 +3,9 @@
  */
 export interface CompanionCommonCallbackContext {
     /**
-     * @deprecated Companion now handles this for you, you should no longer need to use this
+     * @deprecated Companion now handles this for you, you should no longer need use any version of this function
      * Parse and replace all the variables in a string
-     * Note: it is important to use this version when in a feedback, so that the feedback will react properly when the variables parsed change
+     * Note: Any uses of this in feedbacks will not correctly update the feedback when the variable changes.
      * @param text The text to parse
      * @returns The string with variables replaced with their values
      */

package/dist/module-api/common.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=common.js.map

package/dist/module-api/config.d.ts

@@ -1,12 +1,6 @@
-import type { CompanionInputFieldBase, CompanionInputFieldBonjourDevice, CompanionInputFieldCheckbox, CompanionInputFieldColor, CompanionInputFieldDropdown, CompanionInputFieldMultiDropdown, CompanionInputFieldNumber, CompanionInputFieldSecret, CompanionInputFieldStaticText, CompanionInputFieldTextInput } from './input.js';
-/**
- * A configuration input field
- */
-export interface CompanionConfigField extends CompanionInputFieldBase {
-    width: number;
-}
+import type { CompanionInputFieldBonjourDevice, CompanionInputFieldCheckbox, CompanionInputFieldColor, CompanionInputFieldDropdown, CompanionInputFieldMultiDropdown, CompanionInputFieldNumber, CompanionInputFieldSecret, CompanionInputFieldStaticText, CompanionInputFieldTextInput } from './input.js';
 /**
  * Some configuration input field
  */
-export type SomeCompanionConfigField = (CompanionInputFieldStaticText | CompanionInputFieldColor | CompanionInputFieldTextInput | CompanionInputFieldDropdown | CompanionInputFieldMultiDropdown | CompanionInputFieldNumber | CompanionInputFieldCheckbox | CompanionInputFieldBonjourDevice | CompanionInputFieldSecret) & CompanionConfigField;
+export type SomeCompanionConfigField = CompanionInputFieldStaticText | CompanionInputFieldColor | CompanionInputFieldTextInput | CompanionInputFieldDropdown | CompanionInputFieldMultiDropdown | CompanionInputFieldNumber | CompanionInputFieldCheckbox | CompanionInputFieldBonjourDevice | CompanionInputFieldSecret;
 //# sourceMappingURL=config.d.ts.map

package/dist/module-api/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/module-api/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,uBAAuB,EACvB,gCAAgC,EAChC,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,gCAAgC,EAChC,yBAAyB,EACzB,yBAAyB,EACzB,6BAA6B,EAC7B,4BAA4B,EAC5B,MAAM,YAAY,CAAA;AAEnB;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,uBAAuB;IACpE,KAAK,EAAE,MAAM,CAAA;CACb;AAED;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACpC,6BAA6B,GAC7B,wBAAwB,GACxB,4BAA4B,GAC5B,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,GACzB,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,CAC3B,GACA,oBAAoB,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/module-api/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,gCAAgC,EAChC,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,gCAAgC,EAChC,yBAAyB,EACzB,yBAAyB,EACzB,6BAA6B,EAC7B,4BAA4B,EAC5B,MAAM,YAAY,CAAA;AAEnB;;GAEG;AACH,MAAM,MAAM,wBAAwB,GACjC,6BAA6B,GAC7B,wBAAwB,GACxB,4BAA4B,GAC5B,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,GACzB,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,CAAA"}

package/dist/module-api/config.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=config.js.map

package/dist/module-api/enums.d.ts

@@ -12,7 +12,6 @@ export declare enum InstanceStatus {
     UnknownWarning = "unknown_warning",
     AuthenticationFailure = "authentication_failure"
 }
-export type LogLevel = 'info' | 'warn' | 'error' | 'debug';
 export declare namespace Regex {
     const IP = "/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/";
     const HOSTNAME = "/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/";

package/dist/module-api/enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../src/module-api/enums.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,cAAc;IACzB,EAAE,OAAO;IACT,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,iBAAiB,uBAAuB;IACxC,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,cAAc,oBAAoB;IAClC,qBAAqB,2BAA2B;CAChD;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;AAG1D,yBAAiB,KAAK,CAAC;IAEf,MAAM,EAAE,mGAAmG,CAAA;IAC3G,MAAM,QAAQ,iHAC0F,CAAA;IACxG,MAAM,OAAO,0BAA0B,CAAA;IACvC,MAAM,IAAI,4LACyK,CAAA;IACnL,MAAM,WAAW,+CAA+C,CAAA;IAChE,MAAM,OAAO,+BAA+B,CAAA;IAC5C,MAAM,KAAK,2BAA2B,CAAA;IACtC,MAAM,YAAY,gCAAgC,CAAA;IAClD,MAAM,YAAY,6BAA6B,CAAA;IAC/C,MAAM,MAAM,aAAa,CAAA;IACzB,MAAM,aAAa,kBAAkB,CAAA;IACrC,MAAM,SAAS,WAAW,CAAA;IAC1B,MAAM,QAAQ,uGACgF,CAAA;CACrG"}
+{"version":3,"file":"enums.d.ts","sourceRoot":"","sources":["../../src/module-api/enums.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,cAAc;IACzB,EAAE,OAAO;IACT,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,iBAAiB,uBAAuB;IACxC,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,cAAc,oBAAoB;IAClC,qBAAqB,2BAA2B;CAChD;AAGD,yBAAiB,KAAK,CAAC;IAEf,MAAM,EAAE,mGAAmG,CAAA;IAC3G,MAAM,QAAQ,iHAC0F,CAAA;IACxG,MAAM,OAAO,0BAA0B,CAAA;IACvC,MAAM,IAAI,4LACyK,CAAA;IACnL,MAAM,WAAW,+CAA+C,CAAA;IAChE,MAAM,OAAO,+BAA+B,CAAA;IAC5C,MAAM,KAAK,2BAA2B,CAAA;IACtC,MAAM,YAAY,gCAAgC,CAAA;IAClD,MAAM,YAAY,6BAA6B,CAAA;IAC/C,MAAM,MAAM,aAAa,CAAA;IACzB,MAAM,aAAa,kBAAkB,CAAA;IACrC,MAAM,SAAS,WAAW,CAAA;IAC1B,MAAM,QAAQ,uGACgF,CAAA;CACrG"}

package/dist/module-api/enums.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Regex = exports.InstanceStatus = void 0;
 /**
  * All the possible status levels that an instance can use.
  * Note: When adding more, companion needs to be updated to know how they should be displayed
  */
-var InstanceStatus;
+export var InstanceStatus;
 (function (InstanceStatus) {
     InstanceStatus["Ok"] = "ok";
     InstanceStatus["Connecting"] = "connecting";
@@ -15,9 +12,9 @@ var InstanceStatus;
     InstanceStatus["UnknownError"] = "unknown_error";
     InstanceStatus["UnknownWarning"] = "unknown_warning";
     InstanceStatus["AuthenticationFailure"] = "authentication_failure";
-})(InstanceStatus || (exports.InstanceStatus = InstanceStatus = {}));
+})(InstanceStatus || (InstanceStatus = {}));
 // eslint-disable-next-line @typescript-eslint/no-namespace
-var Regex;
+export var Regex;
 (function (Regex) {
     // TODO - are all of these needed?
     Regex.IP = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
@@ -33,5 +30,5 @@ var Regex;
     Regex.SIGNED_NUMBER = '/^[+-]?\\d+$/';
     Regex.SOMETHING = '/^.+$/';
     Regex.TIMECODE = '/^(0*[0-9]|1[0-9]|2[0-4]):(0*[0-9]|[1-5][0-9]|60):(0*[0-9]|[1-5][0-9]|60):(0*[0-9]|[12][0-9]|30)$/';
-})(Regex || (exports.Regex = Regex = {}));
+})(Regex || (Regex = {}));
 //# sourceMappingURL=enums.js.map