Refactor and fix Ableton exporter logic across multiple files

src/lib/exporters/ableton/automation.ts

@@ -1,10 +1,6 @@
 import { FaderParam } from '../../../types/types';
 import { AblGroupPatternOccurrence, AblTrack } from '../../transformers/ableton';
-import {
+import { convertGroupFaderValue, getFaderDefaultValue, getFaderPolicy } from './faderPolicies';
-  convertGroupFaderValue,
-  getFaderDefaultValue,
-  getFaderPolicy,
-} from './faderPolicies';
 
 export type AbletonAutomationTarget = {
   arrangement?: number;
@@ -101,13 +97,7 @@ function getArrangementPoints(
   const points: AutomationPoint[] = [];
   let previousValue = orderedPatterns[0]
     ? getConvertedStaticValue(orderedPatterns[0], parameter, track, groupMixer, target)
-    : convertFaderValue(
+    : convertFaderValue(parameter, getFaderDefaultValue(parameter), track, groupMixer, target);
-        parameter,
-        getFaderDefaultValue(parameter),
-        track,
-        groupMixer,
-        target,
-      );
 
   orderedPatterns.forEach((pattern) => {
     const patternTicks = Math.max(1, pattern.loopDuration * 96);

src/lib/exporters/ableton/builders.ts

@@ -373,10 +373,8 @@ async function buildSimplerDevice(
   simplerFilter.ModByLfo.Manual['@Value'] = 0;
   device.Lfo.IsOn.Manual['@Value'] = 'false';
   device.Pitch.PitchLfoAmount.Manual['@Value'] = 0;
-  device.VolumeAndPan.OneShotEnvelope.FadeInTime.Manual['@Value'] =
+  device.VolumeAndPan.OneShotEnvelope.FadeInTime.Manual['@Value'] = padEnvelope.oneShotFadeInMs;
-    padEnvelope.oneShotFadeInMs;
+  device.VolumeAndPan.OneShotEnvelope.FadeOutTime.Manual['@Value'] = padEnvelope.oneShotFadeOutMs;
-  device.VolumeAndPan.OneShotEnvelope.FadeOutTime.Manual['@Value'] =
-    padEnvelope.oneShotFadeOutMs;
   device.VolumeAndPan.OneShotEnvelope.SustainMode.Manual['@Value'] = 0;
   device.VolumeAndPan.Envelope.AttackTime.Manual['@Value'] = padEnvelope.classicAttackMs;
   device.VolumeAndPan.Envelope.ReleaseTime.Manual['@Value'] = padEnvelope.classicReleaseMs;
@@ -449,10 +447,7 @@ async function buildSimplerDevice(
   device.Pitch.TransposeKey.Manual['@Value'] = pitch;
 
   // adding vibrato from MOD fader param if defined
-  if (
+  if (koTrack.faderParams[FaderParam.MOD] !== -1 || automatedParameters.has(FaderParam.MOD)) {
-    koTrack.faderParams[FaderParam.MOD] !== -1 ||
-    automatedParameters.has(FaderParam.MOD)
-  ) {
     device.Lfo.IsOn.Manual['@Value'] = 'true';
     if (!device.Lfo.Slot.Value.SimplerLfo && abletonVersion === '10') {
       const simplerLfoTemplate = await loadTemplate<any>('simplerLfo', abletonVersion);
@@ -583,11 +578,7 @@ async function buildDrumRackDevice(
     drumBranch.BranchInfo.ChokeGroup['@Value'] = subtrack.inChokeGroup ? 1 : 0;
     drumBranch.MixerDevice.Volume.Manual['@Value'] = subtrack.volume;
     drumBranch.MixerDevice.SendInfos = {};
-    const branchDevices = await buildSimplerDevice(
+    const branchDevices = await buildSimplerDevice(subtrack, abletonVersion, automatedParameters);
-      subtrack,
-      abletonVersion,
-      automatedParameters,
-    );
     assignDeviceListIds([branchDevices]);
     drumBranch.DeviceChain.MidiToAudioDeviceChain.Devices = branchDevices;
 

src/lib/exporters/ableton/faderPolicies.ts

@@ -27,8 +27,7 @@ export const FADER_POLICIES = {
     renderStrategy: 'target',
     targetScope: 'track',
     status: 'mapped',
-    toLive: (value, context) =>
+    toLive: (value, context) => (context.groupMixer ? value : context.track.volume * value),
-      context.groupMixer ? value : context.track.volume * value,
   },
   [FaderParam.PTC]: {
     defaultValue: 0.5,

src/lib/exporters/ableton/padSound.ts

@@ -52,10 +52,8 @@ export function getPadSoundState(track: AblTrack): PadSoundState {
 
 export function getPadEnvelopeState(sound: PadSoundState): PadEnvelopeState {
   return {
-    classicAttackMs:
+    classicAttackMs: koEnvRangeToSeconds(sound.envelope.attack, sound.soundLength) * 1000,
-      koEnvRangeToSeconds(sound.envelope.attack, sound.soundLength) * 1000,
+    classicReleaseMs: koEnvRangeToSeconds(sound.envelope.release, sound.soundLength) * 1000,
-    classicReleaseMs:
-      koEnvRangeToSeconds(sound.envelope.release, sound.soundLength) * 1000,
     oneShotFadeInMs: 0,
     oneShotFadeOutMs: 5,
   };

tests/ableton-fader-policies.test.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 import {
-  FADER_POLICIES,
   convertGroupFaderValue,
+  FADER_POLICIES,
   getFaderPolicy,
 } from '../src/lib/exporters/ableton/faderPolicies';
 import { AblTrack } from '../src/lib/transformers/ableton';
@@ -28,8 +28,5 @@ test('separates Live targets, note transforms and unsupported group parameters',
 test('uses one group-fader conversion path for mixer and pad targets', () => {
   assert.equal(convertGroupFaderValue(FaderParam.LVL, 0.5, { track }), 0.2);
   assert.equal(convertGroupFaderValue(FaderParam.PAN, 0.75, { track }), 0.5);
-  assert.equal(
+  assert.equal(convertGroupFaderValue(FaderParam.PTC, 0.75, { track, valueOffset: 7 }), 9.5);
-    convertGroupFaderValue(FaderParam.PTC, 0.75, { track, valueOffset: 7 }),
-    9.5,
-  );
 });

tests/ableton-pad-sound.test.ts

@@ -1,9 +1,6 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import {
+import { getPadEnvelopeState, getPadSoundState } from '../src/lib/exporters/ableton/padSound';
-  getPadEnvelopeState,
-  getPadSoundState,
-} from '../src/lib/exporters/ableton/padSound';
 import { AblTrack } from '../src/lib/transformers/ableton';
 
 const track = {