Merge remote-tracking branch 'origin/HEAD' into in-source-doc

packages/core/hap.mjs

@@ -4,7 +4,6 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
 export class Hap {
   /*
       Event class, representing a value active during the timespan
@@ -83,6 +82,10 @@ export class Hap {
     );
   }
 
+  showWhole() {
+    return `${this.whole == undefined ? '~' : this.whole.show()}: ${this.value}`;
+  }
+
   combineContext(b) {
     const a = this;
     return { ...a.context, ...b.context, locations: (a.context.locations || []).concat(b.context.locations || []) };
@@ -93,4 +96,4 @@ export class Hap {
   }
 }
 
-export default Hap;
+export default Hap;

packages/core/index.mjs

@@ -7,7 +7,7 @@ This program is free software: you can redistribute it and/or modify it under th
 export * from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-export {Fraction};
+export { Fraction };
 export * from './hap.mjs';
 export * from './pattern.mjs';
 export * from './signal.mjs';

packages/core/package.json

@@ -19,7 +19,7 @@
     "algorave"
   ],
   "author": "Alex McLean <alex@slab.org> (https://slab.org)",
-  "license": "GPL-3.0-or-later",
+  "license": "AGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },

packages/core/signal.mjs

@@ -80,7 +80,10 @@ export const chooseWith = (pat, xs) => {
   if (xs.length == 0) {
     return silence;
   }
-  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]).outerJoin();
+  return pat
+    .range(0, xs.length)
+    .fmap((i) => xs[Math.floor(i)])
+    .outerJoin();
 };
 
 export const choose = (...xs) => chooseWith(rand, xs);
@@ -94,14 +97,14 @@ const _wchooseWith = function (pat, ...pairs) {
     weights.push(accum);
   }
   const total = accum;
-  const match = function(r) {
+  const match = function (r) {
     const find = r * total;
     return values[weights.findIndex((x) => x > find, weights)];
   };
   return pat.fmap(match);
 };
 
-const wchooseWith = (...args) => _wchooseWith(...args).outerJoin()
+const wchooseWith = (...args) => _wchooseWith(...args).outerJoin();
 
 export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 

packages/core/util.mjs

@@ -33,7 +33,7 @@ export const fromMidi = (n) => {
 
 // modulo that works with negative numbers e.g. mod(-1, 3) = 2
 // const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
-export const mod = (n, m) => (n % m + m) % m;
+export const mod = (n, m) => ((n % m) + m) % m;
 
 export const getPlayableNoteValue = (event) => {
   let { value: note, context } = event;