hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: time signal' (#1583) from fix_time into main

Browse source 
Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1583
This commit is contained in:
Switch Angel AKA Jade Rose 2025-09-23 13:28:19 +02:00
commit cedf09168f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/core/fraction.mjs
View file

@ -126,6 +126,8 @@ export const lcm = (...fractions) => {
); );
}; };
export const isFraction = (x) => x instanceof Fraction;
fraction._original = Fraction; fraction._original = Fraction;
export default fraction; export default fraction;

4
packages/core/pattern.mjs
View file

@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
*/ */
import TimeSpan from './timespan.mjs'; import TimeSpan from './timespan.mjs';
import Fraction, { lcm } from './fraction.mjs'; import Fraction, { isFraction, lcm } from './fraction.mjs';
import Hap from './hap.mjs'; import Hap from './hap.mjs';
import State from './state.mjs'; import State from './state.mjs';
import { unionWithObj } from './value.mjs'; import { unionWithObj } from './value.mjs';
@ -999,7 +999,7 @@ addToPrototype('weaveWith', function (t, ...funcs) {
// compose matrix functions // compose matrix functions
function _nonArrayObject(x) { function _nonArrayObject(x) {
return !Array.isArray(x) && typeof x === 'object'; return !Array.isArray(x) && typeof x === 'object' && !isFraction(x);
} }
function _composeOp(a, b, func) { function _composeOp(a, b, func) {
if (_nonArrayObject(a) || _nonArrayObject(b)) { if (_nonArrayObject(a) || _nonArrayObject(b)) {