elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-11 13:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy and add 'keepif'

Browse Source
This commit is contained in:
alex 2022-04-29 17:03:38 +01:00
parent 8cd3be6f67
commit 7af3c33814
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/pattern.mjs
View File

@ -826,6 +826,7 @@ function _composeOp(a, b, func) {
const composers = { const composers = {
set: (a, b) => b, set: (a, b) => b,
keep: (a, b) => a, keep: (a, b) => a,
keepif: (a, b) => b ? a : undefined,
add: (a, b) => a + b, add: (a, b) => a + b,
sub: (a, b) => a - b, sub: (a, b) => a - b,
mul: (a, b) => a * b, mul: (a, b) => a * b,
@ -842,6 +843,7 @@ const composers = {
net: (a, b) => a !== b, net: (a, b) => a !== b,
and: (a, b) => a && b, and: (a, b) => a && b,
or: (a, b) => a || b, or: (a, b) => a || b,
// bitwise ops
_and: (a, b) => a & b, _and: (a, b) => a & b,
_or: (a, b) => a | b, _or: (a, b) => a | b,
_xor: (a, b) => a ^ b, _xor: (a, b) => a ^ b,
@ -850,23 +852,29 @@ const composers = {
func: (a, b) => b(a), func: (a, b) => b(a),
}; };
for (const [name, op] of Object.entries(composers)) { // generate methods to do what and how
for (const opType of ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Reset', 'Restart']) { for (const [what, op] of Object.entries(composers)) {
Pattern.prototype[name + opType] = function (...other) { for (const how of ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Reset', 'Restart']) {
return this['_op' + opType](sequence(other), (a) => (b) => _composeOp(a, b, op)); Pattern.prototype[what + how] = function (...other) {
const result = this['_op' + how](sequence(other), (a) => (b) => _composeOp(a, b, op));
// hack to remove undefs when doing 'keepif'
if (what === 'keepif') {
result = result._removeUndefineds();
}
return result;
}; };
if (opType === 'Squeeze') { if (how === 'Squeeze') {
// support 'squeezeIn' longhand // support 'squeezeIn' longhand
Pattern.prototype[name + "SqueezeIn"] = Pattern.prototype[name + opType]; Pattern.prototype[what + "SqueezeIn"] = Pattern.prototype[what + how];
} }
if (opType === 'In') { if (how === 'In') {
// default how to 'in', e.g. add == addIn // default how to 'in', e.g. add == addIn
Pattern.prototype[name] = Pattern.prototype[name + opType]; Pattern.prototype[what] = Pattern.prototype[what + how];
} }
else { else {
// default what to 'set', e.g. squeeze = setSqueeze // default what to 'set', e.g. squeeze = setSqueeze
if (name === 'set') { if (what === 'set') {
Pattern.prototype[opType.toLowerCase()] = Pattern.prototype[name + opType]; Pattern.prototype[how.toLowerCase()] = Pattern.prototype[what + how];
} }
} }
} }