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

Trying a different naming scheme for composers

Browse Source
This commit is contained in:
alex 2022-04-29 16:46:17 +01:00
parent 23836e2345
commit 86e8ed2ac0
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/core/pattern.mjs
View File

@ -253,20 +253,20 @@ export class Pattern {
);
}
_op(other, func) {
_opIn(other, func) {
return this.fmap(func).appLeft(reify(other));
}
_opFlip(other, func) {
_opOut(other, func) {
return this.fmap(func).appRight(reify(other));
}
_opSect(other, func) {
_opMix(other, func) {
return this.fmap(func).appBoth(reify(other));
}
_opSqueeze(other, func) {
const otherPat = reify(other);
return this.fmap((a) => otherPat.fmap((b) => func(a)(b)))._squeezeJoin();
}
_opSqueezeFlip(other, func) {
_opSqueezeOut(other, func) {
const thisPat = this;
const otherPat = reify(other);
return otherPat.fmap((a) => thisPat.fmap((b) => func(b)(a)))._squeezeJoin();
@ -800,16 +800,43 @@ const composers = {
mul: (a, b) => a * b,
div: (a, b) => a / b,
mod: mod,
pow: Math.pow,
lt: (a, b) => a < b,
gt: (a, b) => a > b,
lte: (a, b) => a <= b,
gte: (a, b) => a >= b,
eq: (a, b) => a == b,
eqt: (a, b) => a === b,
ne: (a, b) => a != b,
net: (a, b) => a !== b,
and: (a, b) => a && b,
or: (a, b) => a || b,
_and: (a, b) => a & b,
_or: (a, b) => a | b,
_xor: (a, b) => a ^ b,
_lshift: (a, b) => a << b,
_rshift: (a, b) => a >> b,
func: (a, b) => b(a),
};
for (const [name, op] of Object.entries(composers)) {
for (const opType of ['', 'Flip', 'Sect', 'Squeeze', 'SqueezeFlip', 'Reset', 'Restart']) {
for (const opType of ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Reset', 'Restart']) {
Pattern.prototype[name + opType] = function (...other) {
return this['_op' + opType](sequence(other), (a) => (b) => _composeOp(a, b, op));
};
if (name === 'set' && opType !== '') {
Pattern.prototype[opType.toLowerCase()] = Pattern.prototype[name + opType];
if (opType === 'Squeeze') {
// support 'squeezeIn' longhand
Pattern.prototype[name + "SqueezeIn"] = Pattern.prototype[name + opType];
}
if (opType === 'In') {
// default how to 'in', e.g. add == addIn
Pattern.prototype[name] = Pattern.prototype[name + opType];
}
else {
// default what to 'set', e.g. squeeze = setSqueeze
if (name === 'set') {
Pattern.prototype[opType.toLowerCase()] = Pattern.prototype[name + opType];
}
}
}
}

13
packages/core/test/pattern.test.mjs
View File

@ -148,11 +148,12 @@ describe('Pattern', function () {
describe('add()', function () {
it('Can add things', function () {
assert.equal(pure(3).add(pure(4)).query(st(0, 1))[0].value, 7);
assert.equal(pure(3).addIn(pure(4)).query(st(0, 1))[0].value, 7);
});
});
describe('addFlip()', () => {
describe('addOut()', () => {
it('Can add things with structure from second pattern', () => {
sameFirst(sequence(1, 2).addFlip(4), sequence(5, 6).struct(true));
sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
});
});
describe('addSqueeze()', () => {
@ -169,10 +170,10 @@ describe('Pattern', function () {
);
});
});
describe('addSqueezeFlip()', () => {
describe('addSqueezeOut()', () => {
it('Can add while squeezing the first pattern inside the events of the second', () => {
sameFirst(
sequence(1, [2, 3]).addSqueezeFlip(10, 20, 30),
sequence(1, [2, 3]).addSqueezeOut(10, 20, 30),
sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
);
});
@ -208,9 +209,9 @@ describe('Pattern', function () {
it('Can set things with plain values', function () {
sameFirst(sequence(1, 2, 3).set(4), sequence(4).fast(3));
});
describe('setFlip()', () => {
describe('setOut()', () => {
it('Can set things with structure from second pattern', () => {
sameFirst(sequence(1, 2).setFlip(4), pure(4).mask(true, true));
sameFirst(sequence(1, 2).setOut(4), pure(4).mask(true, true));
});
});
describe('setSqueeze()', () => {