diff --git a/packages/core/test/value.test.mjs b/packages/core/test/value.test.mjs index ae227e17..1a209623 100644 --- a/packages/core/test/value.test.mjs +++ b/packages/core/test/value.test.mjs @@ -6,6 +6,8 @@ This program is free software: you can redistribute it and/or modify it under th import { describe, it, expect } from 'vitest'; import { map, valued, mul } from '../value.mjs'; +import controls from '../controls.mjs'; +const { n } = controls; describe('Value', () => { it('unionWith', () => { @@ -21,4 +23,8 @@ describe('Value', () => { expect(valued(mul).ap(3).ap(3).value).toEqual(9); expect(valued(3).mul(3).value).toEqual(9); }); + it('union bare numbers for numeral props', () => { + expect(n(3).cutoff(500).add(10).firstCycleValues).toEqual([{ n: 13, cutoff: 510 }]); + expect(n(3).cutoff(500).mul(2).firstCycleValues).toEqual([{ n: 6, cutoff: 1000 }]); + }); }); diff --git a/packages/core/value.mjs b/packages/core/value.mjs index 7eb89013..f9a963ce 100644 --- a/packages/core/value.mjs +++ b/packages/core/value.mjs @@ -7,6 +7,13 @@ This program is free software: you can redistribute it and/or modify it under th import { curry } from './util.mjs'; export function unionWithObj(a, b, func) { + if (typeof b?.value === 'number') { + // https://github.com/tidalcycles/strudel/issues/262 + const numKeys = Object.keys(a).filter((k) => typeof a[k] === 'number'); + const numerals = Object.fromEntries(numKeys.map((k) => [k, b.value])); + b = Object.assign(b, numerals); + delete b.value; + } const common = Object.keys(a).filter((k) => Object.keys(b).includes(k)); return Object.assign({}, a, b, Object.fromEntries(common.map((k) => [k, func(a[k], b[k])]))); }