strudel cli poc

ignore samples
Merge pull request #150 from larkob/prebake-emusp12
2026-07-13 22:35:15 -04:00 · 2022-07-19 23:42:33 +02:00 · 2022-07-19 23:29:11 +02:00 · 2022-07-12 18:58:46 +02:00 · 2022-07-12 11:03:15 +02:00 · 2022-07-12 09:46:18 +02:00
318 changed files with 33300 additions and 38198 deletions
@@ -1,4 +1,5 @@
 dist
+out
 !docs/dist
 dist-*
 cabal-dev
@@ -27,4 +28,10 @@ node_modules/
 repl-parcel
 mytunes.ts
 doc
-.parcel-cache
+out
+.parcel-cache
+repl_old
+tutorial.rendered.mdx
+doc.json
+talk/public/EmuSP12
+talk/public/samples
@@ -32,7 +32,9 @@ Use one of the Communication Channels listed above.
 ## Improve the Tutorial

 If you find some weak spots in the [tutorial](https://strudel.tidalcycles.org/), 
-you are welcome to improve them by editing [this file](https://github.com/tidalcycles/strudel/blob/main/repl/src/tutorial/tutorial.mdx).
+you are welcome to improve them by editing [this file](https://github.com/tidalcycles/strudel/blob/main/tutorial/tutorial.mdx).
+
+
 This will even work without setting up a development environment, only a github account is required.

 ## Propose a Feature
@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@

                            Preamble

-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.

  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.

-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.

-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.

  The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.

  0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.

  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.

  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.

  14. Revised Versions of this License.

  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.

  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    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 General Public License for more details.
+    GNU Affero General Public License for more details.

-    You should have received a copy of the GNU General Public License
+    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/>.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.

  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -2,7 +2,7 @@

 [![Strudel test status](https://github.com/tidalcycles/strudel/actions/workflows/test.yml/badge.svg)](https://github.com/tidalcycles/strudel/actions)

-An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This is unstable software, please tread carefully.
+An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This software is slowly stabilising, but please continue to tread carefully.

 - Try it here: <https://strudel.tidalcycles.org/>
 - Tutorial: <https://strudel.tidalcycles.org/tutorial/>
@@ -27,8 +27,10 @@ There are multiple npm packages you can use to use strudel, or only parts of it,
 - [`tone`](./packages/tone): bindings for Tone.js instruments and effects
 - [`osc`](./packages/osc): bindings to communicate via OSC
 - [`midi`](./packages/midi): webmidi bindings
+- [`serial`](./packages/serial): webserial bindings
 - [`tonal`](./packages/tonal): tonal functions
 - [`xen`](./packages/xen): microtonal / xenharmonic functions
+- ... [and there are more](./packages/)

 Click on the package names to find out more about each one.

@@ -1 +0,0 @@
-strudel.tidalcycles.org
@@ -1,16 +0,0 @@
-{
-  "files": {
-    "main.css": "/static/css/main.0d689283.css",
-    "main.js": "/static/js/main.f7b8088f.js",
-    "static/js/787.1c52cb78.chunk.js": "/static/js/787.1c52cb78.chunk.js",
-    "static/media/logo.svg": "/static/media/logo.ac95051720b3dccfe511e0e02d8e1029.svg",
-    "index.html": "/index.html",
-    "main.0d689283.css.map": "/static/css/main.0d689283.css.map",
-    "main.f7b8088f.js.map": "/static/js/main.f7b8088f.js.map",
-    "787.1c52cb78.chunk.js.map": "/static/js/787.1c52cb78.chunk.js.map"
-  },
-  "entrypoints": [
-    "static/css/main.0d689283.css",
-    "static/js/main.f7b8088f.js"
-  ]
-}
@@ -1 +0,0 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.f7b8088f.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
@@ -1,15 +0,0 @@
-{
-  "short_name": "Strudel REPL",
-  "name": "Strudel REPL - Tidal Patterns in JavaScript",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
@@ -1,2 +0,0 @@
-"use strict";(self.webpackChunk_strudel_cycles_repl=self.webpackChunk_strudel_cycles_repl||[]).push([[787],{787:function(e,t,n){n.r(t),n.d(t,{getCLS:function(){return y},getFCP:function(){return g},getFID:function(){return C},getLCP:function(){return P},getTTFB:function(){return D}});var i,r,a,o,u=function(e,t){return{name:e,value:void 0===t?-1:t,delta:0,entries:[],id:"v2-".concat(Date.now(),"-").concat(Math.floor(8999999999999*Math.random())+1e12)}},c=function(e,t){try{if(PerformanceObserver.supportedEntryTypes.includes(e)){if("first-input"===e&&!("PerformanceEventTiming"in self))return;var n=new PerformanceObserver((function(e){return e.getEntries().map(t)}));return n.observe({type:e,buffered:!0}),n}}catch(e){}},f=function(e,t){var n=function n(i){"pagehide"!==i.type&&"hidden"!==document.visibilityState||(e(i),t&&(removeEventListener("visibilitychange",n,!0),removeEventListener("pagehide",n,!0)))};addEventListener("visibilitychange",n,!0),addEventListener("pagehide",n,!0)},s=function(e){addEventListener("pageshow",(function(t){t.persisted&&e(t)}),!0)},m=function(e,t,n){var i;return function(r){t.value>=0&&(r||n)&&(t.delta=t.value-(i||0),(t.delta||void 0===i)&&(i=t.value,e(t)))}},v=-1,p=function(){return"hidden"===document.visibilityState?0:1/0},d=function(){f((function(e){var t=e.timeStamp;v=t}),!0)},l=function(){return v<0&&(v=p(),d(),s((function(){setTimeout((function(){v=p(),d()}),0)}))),{get firstHiddenTime(){return v}}},g=function(e,t){var n,i=l(),r=u("FCP"),a=function(e){"first-contentful-paint"===e.name&&(f&&f.disconnect(),e.startTime<i.firstHiddenTime&&(r.value=e.startTime,r.entries.push(e),n(!0)))},o=window.performance&&performance.getEntriesByName&&performance.getEntriesByName("first-contentful-paint")[0],f=o?null:c("paint",a);(o||f)&&(n=m(e,r,t),o&&a(o),s((function(i){r=u("FCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,n(!0)}))}))})))},h=!1,T=-1,y=function(e,t){h||(g((function(e){T=e.value})),h=!0);var n,i=function(t){T>-1&&e(t)},r=u("CLS",0),a=0,o=[],v=function(e){if(!e.hadRecentInput){var t=o[0],i=o[o.length-1];a&&e.startTime-i.startTime<1e3&&e.startTime-t.startTime<5e3?(a+=e.value,o.push(e)):(a=e.value,o=[e]),a>r.value&&(r.value=a,r.entries=o,n())}},p=c("layout-shift",v);p&&(n=m(i,r,t),f((function(){p.takeRecords().map(v),n(!0)})),s((function(){a=0,T=-1,r=u("CLS",0),n=m(i,r,t)})))},E={passive:!0,capture:!0},w=new Date,L=function(e,t){i||(i=t,r=e,a=new Date,F(removeEventListener),S())},S=function(){if(r>=0&&r<a-w){var e={entryType:"first-input",name:i.type,target:i.target,cancelable:i.cancelable,startTime:i.timeStamp,processingStart:i.timeStamp+r};o.forEach((function(t){t(e)})),o=[]}},b=function(e){if(e.cancelable){var t=(e.timeStamp>1e12?new Date:performance.now())-e.timeStamp;"pointerdown"==e.type?function(e,t){var n=function(){L(e,t),r()},i=function(){r()},r=function(){removeEventListener("pointerup",n,E),removeEventListener("pointercancel",i,E)};addEventListener("pointerup",n,E),addEventListener("pointercancel",i,E)}(t,e):L(t,e)}},F=function(e){["mousedown","keydown","touchstart","pointerdown"].forEach((function(t){return e(t,b,E)}))},C=function(e,t){var n,a=l(),v=u("FID"),p=function(e){e.startTime<a.firstHiddenTime&&(v.value=e.processingStart-e.startTime,v.entries.push(e),n(!0))},d=c("first-input",p);n=m(e,v,t),d&&f((function(){d.takeRecords().map(p),d.disconnect()}),!0),d&&s((function(){var a;v=u("FID"),n=m(e,v,t),o=[],r=-1,i=null,F(addEventListener),a=p,o.push(a),S()}))},k={},P=function(e,t){var n,i=l(),r=u("LCP"),a=function(e){var t=e.startTime;t<i.firstHiddenTime&&(r.value=t,r.entries.push(e),n())},o=c("largest-contentful-paint",a);if(o){n=m(e,r,t);var v=function(){k[r.id]||(o.takeRecords().map(a),o.disconnect(),k[r.id]=!0,n(!0))};["keydown","click"].forEach((function(e){addEventListener(e,v,{once:!0,capture:!0})})),f(v,!0),s((function(i){r=u("LCP"),n=m(e,r,t),requestAnimationFrame((function(){requestAnimationFrame((function(){r.value=performance.now()-i.timeStamp,k[r.id]=!0,n(!0)}))}))}))}},D=function(e){var t,n=u("TTFB");t=function(){try{var t=performance.getEntriesByType("navigation")[0]||function(){var e=performance.timing,t={entryType:"navigation",startTime:0};for(var n in e)"navigationStart"!==n&&"toJSON"!==n&&(t[n]=Math.max(e[n]-e.navigationStart,0));return t}();if(n.value=n.delta=t.responseStart,n.value<0||n.value>performance.now())return;n.entries=[t],e(n)}catch(e){}},"complete"===document.readyState?setTimeout(t,0):addEventListener("load",(function(){return setTimeout(t,0)}))}}}]);
-//# sourceMappingURL=787.1c52cb78.chunk.js.map
@@ -1,56 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/**
- * @license Fraction.js v4.2.0 05/03/2022
- * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
- *
- * Copyright (c) 2021, Robert Eisele (robert@xarg.org)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- **/
-
-/**
- * Tone.js
- * @author Yotam Mann
- * @license http://opensource.org/licenses/MIT MIT License
- * @copyright 2014-2019 Yotam Mann
- */
-
-/** @license React v0.20.2
- * scheduler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react-dom.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react-jsx-runtime.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
@@ -1 +0,0 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.757e9f9d.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.36c08014.js" defer></script> </body></html>
@@ -1,131 +0,0 @@
-# Tidal Features in Strudel
-
-## Basics
-
- [ ] drawLine
- [ ] setcps
- [ ] naming patterns? block based evaluation?
- [ ] once
- [x] silence
- [x] hush
- [ ] panic
-
-## Concatenation
-
-https://tidalcycles.org/docs/patternlib/tour/concatenation
-
- [x] cat: is synonym to fastcat in strudel, while [in tidal, cat is slowcat](https://tidalcycles.org/docs/patternlib/tour/concatenation#cat)
- [x] fastcat
- [x] timeCat: why is this camel case?
- [ ] randcat
- [x] append: but is like fastAppend in tidal
- [ ] fastAppend
- [ ] slowAppend
- [ ] wedge
- [ ] brak
- [ ] flatpat
-
-## Accumulation
-
- [ ] overlay => like stack? "The overlay function is similar to cat" => wrong?
- [ ] `<>` operator (=== overlay)
- [x] stack
- [x] superimpose
- [x] layer
- [ ] steps ?
- [x] iter
- [x] iter' = iterBack
-
-## Alteration
-
- [ ] range, rangex
- [ ] quantise
- [ ] ply
- [x] stutter = echo
- [ ] stripe, slowstripe
- [ ] palindrome = every(2, rev)
- [ ] trunc
- [ ] linger
- [x] chunk, chunk'
- [ ] shuffle
- [ ] scramble
- [ ] rot
- [ ] step / step'
- [ ] lindenmeyer
- [ ] spread / spreadf / fastspread
- [ ] spreadChoose / spreadr
-
-## conditions
-
- [x] every
- [ ] every'
- [ ] whenmod
- [ ] sometimes, sometimesBy, someCycles, someCyclesBy
- [ ] choose, chooseby, wchoose, wchooseby
- [x] struct
- [x] mask
- [ ] sew
- [ ] stitch
- [ ] select, selectF
- [ ] pickF
- [ ] squeeze
- [x] euclid, euclidLegato
- [ ] euclidInv, euclidFull
- [ ] ifp
-
-## Time
-
- [x] fast
- [x] fastGap
- [x] slow
- [ ] hurry
- [ ] compress: is this compressSpan?
- [ ] zoom
- [ ] within
- [x] off
- [ ] rotL / rotR
- [x] rev
- [x] jux
- [ ] juxBy
- [ ] swingBy / swing
- [ ] ghost
- [ ] inside / outside
-
-## Harmony & Melody
-
- [x] scale
- [ ] scaleList
- [ ] getScale
- [ ] toScale
- [ ] chordList
- [ ] arpeggiate
- [ ] arp
-
-## Transitions
-
- [ ] anticipate / anticipateIn
- [ ] clutch / clutchIn
- [ ] histpan
- [ ] interpolate / interpolateIn
- [ ] jump / jumpIn / jumpIn' / jumpMod
- [ ] wait / waitT
- [ ] wash / washIn
- [ ] xfade / xfadeIn
-
-## Sampling
-
- [ ] chop
- [ ] striate / striateBy
- [ ] loopAt
- [x] segment
- [ ] discretise
-
-## Randomness
-
- [ ] rand / irand
- [ ] perlin / perlinWith / perlin2 / perlin2With
-
-## Composition
-
- [ ] ur
- [ ] seqP / seqPLoop
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<script>import("./strudel.js").then(m => strudel = m)
-</script>
-<html>
-    <head>
-        <title>Bingo</title>
-    </head>
-    <body>
-        <button onclick="foo()">hello</button>
-        <button onclick="bar()">hello</button>
-
-        <script type="module" src="./strudel.js"></script>
-    </body>
-</html>
@@ -0,0 +1,11 @@
+{
+  "source": {
+    "includePattern": ".+\\.(js(doc|x)?|mjs)$",
+    "excludePattern": "node_modules|shift-parser|shift-reducer|shift-traverser"
+  },
+  "plugins": ["plugins/markdown"],
+  "opts": {
+    "destination": "./out/",
+    "recurse": true
+  }
+}
@@ -3,14 +3,18 @@
  "version": "0.0.1",
  "private": true,
  "description": "Port of tidalcycles to javascript",
-  "main": "strudel.mjs",
  "scripts": {
-    "test": "npm run test --workspaces --if-present",
+    "test": "npm run test --workspaces --if-present && cd repl && npm run test",
    "bootstrap": "lerna bootstrap",
-    "setup": "npm i && npm run bootstrap && cd repl && npm i",
-    "repl": "cd repl && npm run start",
+    "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
+    "snapshot": "cd repl && npm run snapshot",
+    "repl": "cd repl && npm run dev",
    "osc": "cd packages/osc && npm run server",
-    "build": "cd repl && npm run build"
+    "build": "rm -rf out && cd repl && npm run build && cd ../tutorial && npm run build",
+    "preview": "npx serve ./out",
+    "deploy": "gh-pages -d out",
+    "jsdoc": "jsdoc packages/ -c jsdoc.config.json",
+    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json"
  },
  "workspaces": [
    "packages/*"
@@ -27,13 +31,17 @@
    "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"
  },
  "homepage": "https://strudel.tidalcycles.org",
  "devDependencies": {
    "events": "^3.3.0",
+    "gh-pages": "^4.0.0",
+    "jsdoc": "^3.6.10",
+    "jsdoc-json": "^2.0.2",
+    "jsdoc-to-markdown": "^7.1.1",
    "lerna": "^4.0.0",
    "mocha": "^9.1.4"
  }
@@ -1,101 +1,440 @@
+/*
+controls.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/controls.mjs>
+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/>.
+*/
+
 import { Pattern, sequence } from './pattern.mjs';

 const controls = {};
 const generic_params = [
+  /**
+   * Select a sound / sample by name.
+   *
+   * <details>
+   * <summary>show all sounds</summary>
+   *
+   * 808 (6) 808bd (25) 808cy (25) 808hc (5) 808ht (5) 808lc (5) 808lt (5) 808mc (5) 808mt (5) 808oh (5) 808sd (25) 909 (1) ab (12) ade (10) ades2 (9) ades3 (7) ades4 (6) alex (2) alphabet (26) amencutup (32) armora (7) arp (2) arpy (11) auto (11) baa (7) baa2 (7) bass (4) bass0 (3) bass1 (30) bass2 (5) bass3 (11) bassdm (24) bassfoo (3) battles (2) bd (24) bend (4) bev (2) bin (2) birds (10) birds3 (19) bleep (13) blip (2) blue (2) bottle (13) breaks125 (2) breaks152 (1) breaks157 (1) breaks165 (1) breath (1) bubble (8) can (14) casio (3) cb (1) cc (6) chin (4) circus (3) clak (2) click (4) clubkick (5) co (4) coins (1) control (2) cosmicg (15) cp (2) cr (6) crow (4) d (4) db (13) diphone (38) diphone2 (12) dist (16) dork2 (4) dorkbot (2) dr (42) dr2 (6) dr55 (4) dr_few (8) drum (6) drumtraks (13) e (8) east (9) electro1 (13) em2 (6) erk (1) f (1) feel (7) feelfx (8) fest (1) fire (1) flick (17) fm (17) foo (27) future (17) gab (10) gabba (4) gabbaloud (4) gabbalouder (4) glasstap (3) glitch (8) glitch2 (8) gretsch (24) gtr (3) h (7) hand (17) hardcore (12) hardkick (6) haw (6) hc (6) hh (13) hh27 (13) hit (6) hmm (1) ho (6) hoover (6) house (8) ht (16) if (5) ifdrums (3) incoming (8) industrial (32) insect (3) invaders (18) jazz (8) jungbass (20) jungle (13) juno (12) jvbass (13) kicklinn (1) koy (2) kurt (7) latibro (8) led (1) less (4) lighter (33) linnhats (6) lt (16) made (7) made2 (1) mash (2) mash2 (4) metal (10) miniyeah (4) monsterb (6) moog (7) mouth (15) mp3 (4) msg (9) mt (16) mute (28) newnotes (15) noise (1) noise2 (8) notes (15) numbers (9) oc (4) odx (15) off (1) outdoor (6) pad (3) padlong (1) pebbles (1) perc (6) peri (15) pluck (17) popkick (10) print (11) proc (2) procshort (8) psr (30) rave (8) rave2 (4) ravemono (2) realclaps (4) reverbkick (1) rm (2) rs (1) sax (22) sd (2) seawolf (3) sequential (8) sf (18) sheffield (1) short (5) sid (12) sine (6) sitar (8) sn (52) space (18) speakspell (12) speech (7) speechless (10) speedupdown (9) stab (23) stomp (10) subroc3d (11) sugar (2) sundance (6) tabla (26) tabla2 (46) tablex (3) tacscan (22) tech (13) techno (7) tink (5) tok (4) toys (13) trump (11) ul (10) ulgab (5) uxay (3) v (6) voodoo (5) wind (10) wobble (1) world (3) xmas (1) yeah (31)
+   *
+   * <a href="https://tidalcycles.org/docs/configuration/Audio%20Samples/default_library" target="_blank">more info</a>
+   *
+   * </details>
+   *
+   * @name s
+   * @param {string | Pattern} sound The sound / pattern of sounds to pick
+   * @example
+   * s("bd hh").osc()
+   *
+   */
  ['s', 's', 'sound'],
+  /**
+   * The note or sample number to choose for a synth or sampleset
+   * Note names currently not working yet, but will hopefully soon. Just stick to numbers for now
+   *
+   * @name n
+   * @param {string | number | Pattern} value note name, note number or sample number
+   * @example
+   * s('superpiano').n("<0 1 2 3>").osc()
+   * @example
+   * s('superpiano').n("<c4 d4 e4 g4>").osc()
+   * @example
+   * n("0 1 2 3").s('east').osc()
+   */
+  // TODO: nOut does not work
+  // TODO: notes don't work as expected
+  // current "workaround" for notes:
+  // s('superpiano').n("<c0 d0 e0 g0>"._asNumber()).osc()
+  // -> .n or .osc (or .superdirt) would need to convert note strings to numbers
+  // also see https://github.com/tidalcycles/strudel/pull/63
+  ['f', 'n', 'The note or sample number to choose for a synth or sampleset'],
+  ['f', 'note', 'The note or pitch to play a sound or synth with'],
  //['s', 'toArg', 'for internal sound routing'],
  // ["f", "from", "for internal sound routing"),
  //['f', 'to', 'for internal sound routing'],
+  /**
+   * A pattern of numbers that speed up (or slow down) samples while they play. Currently only supported by osc / superdirt.
+   *
+   * @name accelerate
+   * @param {number | Pattern} amount acceleration.
+   * @example
+   * s("sax").accelerate("<0 1 2 4 8 16>").slow(2).osc()
+   *
+   */
  ['f', 'accelerate', 'a pattern of numbers that speed up (or slow down) samples while they play.'],
-  ['f', 'amp', 'like @gain@, but linear.'],
-  [
-    'f',
-    'attack',
-    'a pattern of numbers to specify the attack time (in seconds) of an envelope applied to each sample.',
-  ],
-  ['f', 'bandf', 'a pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
-  ['f', 'bandq', 'a pattern of anumbers from 0 to 1. Sets the q-factor of the band-pass filter.'],
-  [
-    'f',
-    'begin',
-    'a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.',
-  ],
-  ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
-  // ['f', 'clhatdecay', ''],
-  [
-    'f',
-    'crush',
-    'bit crushing, a pattern of numbers from 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).',
-  ],
-  [
-    'f',
-    'coarse',
-    'fake-resampling, a pattern of numbers for lowering the sample rate, i.e. 1 for original 2 for half, 3 for a third and so on.',
-  ],
-  ['i', 'channel', 'choose the channel the pattern is sent to in superdirt'],
-  [
-    'i',
-    'cut',
-    'In the style of classic drum-machines, `cut` will stop a playing sample as soon as another samples with in same cutgroup is to be played. An example would be an open hi-hat followed by a closed one, essentially muting the open.',
-  ],
-  ['f', 'cutoff', 'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the low-pass filter.'],
-  // ['f', 'cutoffegint', ''],
-  ['f', 'decay', ''],
-  ['f', 'delay', 'a pattern of numbers from 0 to 1. Sets the level of the delay signal.'],
-  ['f', 'delayfeedback', 'a pattern of numbers from 0 to 1. Sets the amount of delay feedback.'],
-  ['f', 'delaytime', 'a pattern of numbers from 0 to 1. Sets the length of the delay.'],
-  ['f', 'detune', ''],
-  ['f', 'djf', 'DJ filter, below 0.5 is low pass filter, above is high pass filter.'],
-  [
-    'f',
-    'dry',
-    'when set to `1` will disable all reverb for this pattern. See `room` and `size` for more information about reverb.',
-  ],
-  [
-    'f',
-    'end',
-    'the same as `begin`, but cuts the end off samples, shortening them; e.g. `0.75` to cut off the last quarter of each sample.',
-  ],
-  [
-    'f',
-    'fadeTime',
-    "Used when using begin/end or chop/striate and friends, to change the fade out time of the 'grain' envelope.",
-  ],
-  [
-    'f',
-    'fadeInTime',
-    'As with fadeTime, but controls the fade in time of the grain envelope. Not used if the grain begins at position 0 in the sample.',
-  ],
-  ['f', 'freq', ''],
+  /**
+   * Like {@link amp}, but exponential.
+   *
+   * @name gain
+   * @param {number | Pattern} amount gain.
+   * @example
+   * s("bd*8").gain(".7*2 1 .7*2 1 .7 1").osc()
+   *
+   */
  [
    'f',
    'gain',
    'a pattern of numbers that specify volume. Values less than 1 make the sound quieter. Values greater than 1 make the sound louder. For the linear equivalent, see @amp@.',
  ],
-  ['f', 'gate', ''],
-  // ['f', 'hatgrain', ''],
+  /**
+   * Like {@link gain}, but linear.
+   *
+   * @name amp
+   * @param {number | Pattern} amount gain.
+   * @example
+   * s("bd*8").amp(".1*2 .5 .1*2 .5 .1 .5").osc()
+   *
+   */
+  ['f', 'amp', 'like @gain@, but linear.'],
+  // TODO: find out why 0 does not work, and it generally seems not right
+  /*
+   * A pattern of numbers to specify the attack time of an envelope applied to each sample.
+   *
+   * @name attack
+   * @param {number | Pattern} attack time in seconds.
+   * @example
+   * n("c5 e5").s('superpiano').attack("<0 .1>").osc()
+   *
+   */
  [
    'f',
-    'hcutoff',
-    'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the high-pass filter. Also has alias @hpf@',
+    'attack',
+    'a pattern of numbers to specify the attack time (in seconds) of an envelope applied to each sample.',
+  ],
+  // TODO: find out how this works?
+  /*
+   * Envelope decay time = the time it takes after the attack time to reach the sustain level.
+   *
+   * @name decay
+   * @param {number | Pattern} time decay time in seconds
+   * @example
+   * s("sax").cut(1).decay("<.1 .2 .3 .4>").sustain(0).osc()
+   *
+   */
+  ['f', 'decay', ''],
+  ['f', 'sustain', ''],
+  [
+    'f',
+    'release',
+    'a pattern of numbers to specify the release time (in seconds) of an envelope applied to each sample.',
  ],
  [
    'f',
    'hold',
    'a pattern of numbers to specify the hold time (in seconds) of an envelope applied to each sample. Only takes effect if `attack` and `release` are also specified.',
  ],
+  // TODO: in tidal, it seems to be normalized
+  /**
+   * Sets the center frequency of the band-pass filter.
+   *
+   * @name bandf
+   * @param {number | Pattern} frequency center frequency
+   * @example
+   * s("bd sd").bandf("<1000 2000 4000 8000>").osc()
+   *
+   */
+  ['f', 'bandf', 'A pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
+  // TODO: in tidal, it seems to be normalized
+  /**
+   * Sets the q-factor of the band-pass filter
+   *
+   * @name bandq
+   * @param {number | Pattern} q q factor
+   * @example
+   * s("bd sd").bandf(2000).bandq("<.2 .9>").osc()
+   *
+   */
+  ['f', 'bandq', 'a pattern of anumbers from 0 to 1. Sets the q-factor of the band-pass filter.'],
+  /**
+   * a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
+   *
+   * @name begin
+   * @param {number | Pattern} amount between 0 and 1, where 1 is the length of the sample
+   * @example
+   * s("rave").begin("<0 .25 .5 .75>").osc()
+   *
+   */
+  [
+    'f',
+    'begin',
+    'a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.',
+  ],
+  /**
+   * The same as {@link begin}, but cuts off the end off each sample.
+   *
+   * @name end
+   * @param {number | Pattern} length 1 = whole sample, .5 = half sample, .25 = quarter sample etc..
+   * @example
+   * s("bd*2,ho*4").end("<.1 .2 .5 1>").osc()
+   *
+   */
+  [
+    'f',
+    'end',
+    'the same as `begin`, but cuts the end off samples, shortening them; e.g. `0.75` to cut off the last quarter of each sample.',
+  ],
+  /**
+   * Loops the sample (from `begin` to `end`) the specified number of times.
+   * Note that the tempo of the loop is not synced with the cycle tempo.
+   *
+   * @name loop
+   * @param {number | Pattern} times How often the sample is looped
+   * @example
+   * s("bd").loop("<1 2 3 4>").osc()
+   *
+   */
+  ['f', 'loop', 'loops the sample (from `begin` to `end`) the specified number of times.'],
+  // TODO: currently duplicated with "native" legato
+  // TODO: superdirt legato will do more: https://youtu.be/dQPmE1WaD1k?t=419
+  /**
+   * a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
+   *
+   * @name legato
+   * @param {number | Pattern} duration between 0 and 1, where 1 is the length of the whole hap time
+   * @example
+   * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
+   *
+   */
+  ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
+  // ['f', 'clhatdecay', ''],
+  /**
+   * bit crusher effect.
+   *
+   * @name crush
+   * @param {number | Pattern} depth between 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).
+   * @example
+   * s("<bd sd>,hh*3,jvbass*2").fast(2).crush("<16 8 7 6 5 4 3 2>").osc()
+   *
+   */
+  [
+    'f',
+    'crush',
+    'bit crushing, a pattern of numbers from 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).',
+  ],
+  /**
+   * fake-resampling for lowering the sample rate
+   *
+   * @name coarse
+   * @param {number | Pattern} factor 1 for original 2 for half, 3 for a third and so on.
+   * @example
+   * s("xmas").coarse("<1 4 8 16 32>").osc()
+   *
+   */
+  [
+    'f',
+    'coarse',
+    'fake-resampling, a pattern of numbers for lowering the sample rate, i.e. 1 for original 2 for half, 3 for a third and so on.',
+  ],
+
+  /**
+   * choose the channel the pattern is sent to in superdirt
+   *
+   * @name channel
+   * @param {number | Pattern} channel channel number
+   *
+   */
+  ['i', 'channel', 'choose the channel the pattern is sent to in superdirt'],
+  /**
+   * In the style of classic drum-machines, `cut` will stop a playing sample as soon as another samples with in same cutgroup is to be played. An example would be an open hi-hat followed by a closed one, essentially muting the open.
+   *
+   * @name cut
+   * @param {number | Pattern} group cut group number
+   * @example
+   * s("bd sax").cut(1).osc()
+   *
+   */
+  [
+    'i',
+    'cut',
+    'In the style of classic drum-machines, `cut` will stop a playing sample as soon as another samples with in same cutgroup is to be played. An example would be an open hi-hat followed by a closed one, essentially muting the open.',
+  ],
+  /**
+   * Applies the cutoff frequency of the low-pass filter.
+   *
+   * @name cutoff
+   * @param {number | Pattern} frequency audible between 0 and 20000
+   * @example
+   * s("bd,hh*2,<~ sd>").fast(2).cutoff("<4000 2000 1000 500 200 100>").osc()
+   *
+   */
+  // TODO: add lpf synonym
+  ['f', 'cutoff', 'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the low-pass filter.'],
+  /**
+   * Applies the cutoff frequency of the high-pass filter.
+   *
+   * @name hcutoff
+   * @param {number | Pattern} frequency audible between 0 and 20000
+   * @example
+   * s("bd,hh*2,<~ sd>").fast(2).hcutoff("<4000 2000 1000 500 200 100>").osc()
+   *
+   */
+  // TODO: add hpf synonym
+  [
+    'f',
+    'hcutoff',
+    'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the high-pass filter. Also has alias @hpf@',
+  ],
+  /**
+   * Applies the cutoff frequency of the high-pass filter.
+   *
+   * @name hresonance
+   * @param {number | Pattern} q resonance factor between 0 and 1
+   * @example
+   * s("bd,hh*2,<~ sd>").fast(2).hcutoff(2000).hresonance("<0 .2 .4 .6>").osc()
+   *
+   */
  [
    'f',
    'hresonance',
    'a pattern of numbers from 0 to 1. Applies the resonance of the high-pass filter. Has alias @hpq@',
  ],
+  // TODO: add hpq synonym
+  /**
+   * Applies the cutoff frequency of the low-pass filter.
+   *
+   * @name resonance
+   * @param {number | Pattern} q resonance factor between 0 and 1
+   * @example
+   * s("bd,hh*2,<~ sd>").fast(2).cutoff(2000).resonance("<0 .2 .4 .6>").osc()
+   *
+   */
+  ['f', 'resonance', 'a pattern of numbers from 0 to 1. Specifies the resonance of the low-pass filter.'],
+  // TODO: add lpq synonym?
+  /**
+   * Set detune of oscillators. Works only with some synths, see <a target="_blank" href="https://tidalcycles.org/docs/patternlib/tutorials/synthesizers">tidal doc</a>
+   *
+   * @name djf
+   * @param {number | Pattern} cutoff below 0.5 is low pass filter, above is high pass filter
+   * @example
+   * n("0 3 7 [10,24]").s('superzow').octave(3).djf("<.5 .25 .5 .75>").osc()
+   *
+   */
+  ['f', 'djf', 'DJ filter, below 0.5 is low pass filter, above is high pass filter.'],
+  // ['f', 'cutoffegint', ''],
+  // TODO: does not seem to work
+  /*
+   * Sets the level of the delay signal.
+   *
+   * @name delay
+   * @param {number | Pattern} level between 0 and 1
+   * @example
+   * s("bd").delay("<0 .5 .75 1>").osc()
+   *
+   */
+  ['f', 'delay', 'a pattern of numbers from 0 to 1. Sets the level of the delay signal.'],
+  ['f', 'delayfeedback', 'a pattern of numbers from 0 to 1. Sets the amount of delay feedback.'],
+  ['f', 'delaytime', 'a pattern of numbers from 0 to 1. Sets the length of the delay.'],
+  /* // TODO: test
+   * Specifies whether delaytime is calculated relative to cps.
+   *
+   * @name lock
+   * @param {number | Pattern} enable When set to 1, delaytime is a direct multiple of a cycle.
+   * @example
+   * s("sd").delay().lock(1).osc()
+   *
+   */
+  [
+    'f',
+    'lock',
+    'A pattern of numbers. Specifies whether delaytime is calculated relative to cps. When set to 1, delaytime is a direct multiple of a cycle.',
+  ],
+  /**
+   * Set detune of oscillators. Works only with some synths, see <a target="_blank" href="https://tidalcycles.org/docs/patternlib/tutorials/synthesizers">tidal doc</a>
+   *
+   * @name detune
+   * @param {number | Pattern} amount between 0 and 1
+   * @example
+   * n("0 3 7").s('superzow').octave(3).detune("<0 .25 .5 1 2>").osc()
+   *
+   */
+  ['f', 'detune', ''],
+  /**
+   * Set dryness of reverb. See {@link room} and {@link size} for more information about reverb.
+   *
+   * @name dry
+   * @param {number | Pattern} dry 0 = wet, 1 = dry
+   * @example
+   * n("[0,3,7](3,8)").s("superpiano").room(.7).dry("<0 .5 .75 1>").osc()
+   *
+   */
+  [
+    'f',
+    'dry',
+    'when set to `1` will disable all reverb for this pattern. See `room` and `size` for more information about reverb.',
+  ],
+  // TODO: does not seem to do anything
+  /*
+   * Used when using {@link begin}/{@link end} or {@link chop}/{@link striate} and friends, to change the fade out time of the 'grain' envelope.
+   *
+   * @name fadeTime
+   * @param {number | Pattern} time between 0 and 1
+   * @example
+   * s("ho*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
+   *
+   */
+  [
+    'f',
+    'fadeTime',
+    "Used when using begin/end or chop/striate and friends, to change the fade out time of the 'grain' envelope.",
+  ],
+  // TODO: see above
+  [
+    'f',
+    'fadeInTime',
+    'As with fadeTime, but controls the fade in time of the grain envelope. Not used if the grain begins at position 0 in the sample.',
+  ],
+  /**
+   * Set frequency of sound.
+   *
+   * @name freq
+   * @param {number | Pattern} frequency in Hz. the audible range is between 20 and 20000 Hz
+   * @example
+   * freq("220 110 440 110").s("superzow").osc()
+   * @example
+   * freq("110".mulOut(".5 1.5 .6 [2 3]")).s("superzow").osc()
+   *
+   */
+  ['f', 'freq', ''],
+  // TODO: https://tidalcycles.org/docs/configuration/MIDIOSC/control-voltage/#gate
+  ['f', 'gate', ''],
+  // ['f', 'hatgrain', ''],
  // ['f', 'lagogo', ''],
  // ['f', 'lclap', ''],
  // ['f', 'lclaves', ''],
  // ['f', 'lclhat', ''],
  // ['f', 'lcrash', ''],
+  // TODO:
+  // https://tidalcycles.org/docs/reference/audio_effects/#leslie-1
+  // https://tidalcycles.org/docs/reference/audio_effects/#leslie
+  /**
+   * Emulation of a Leslie speaker: speakers rotating in a wooden amplified cabinet.
+   *
+   * @name leslie
+   * @param {number | Pattern} wet between 0 and 1
+   * @example
+   * n("0,4,7").s("supersquare").leslie("<0 .4 .6 1>").osc()
+   *
+   */
  ['f', 'leslie', ''],
+  /**
+   * Rate of modulation / rotation for leslie effect
+   *
+   * @name lrate
+   * @param {number | Pattern} rate 6.7 for fast, 0.7 for slow
+   * @example
+   * n("0,4,7").s("supersquare").leslie(1).lrate("<1 2 4 8>").osc()
+   *
+   */
+  // TODO: the rate seems to "lag" (in the example, 1 will be fast)
  ['f', 'lrate', ''],
+  /**
+   * Physical size of the cabinet in meters. Be careful, it might be slightly larger than your computer. Affects the Doppler amount (pitch warble)
+   *
+   * @name lsize
+   * @param {number | Pattern} meters somewhere between 0 and 1
+   * @example
+   * n("0,4,7").s("supersquare").leslie(1).lrate(2).lsize("<.1 .5 1>").osc()
+   *
+   */
  ['f', 'lsize', ''],
  // ['f', 'lfo', ''],
  // ['f', 'lfocutoffint', ''],
@@ -107,47 +446,86 @@ const generic_params = [
  // ['f', 'lhitom', ''],
  // ['f', 'lkick', ''],
  // ['f', 'llotom', ''],
-  [
-    'f',
-    'lock',
-    'A pattern of numbers. Specifies whether delaytime is calculated relative to cps. When set to 1, delaytime is a direct multiple of a cycle.',
-  ],
-  ['f', 'loop', 'loops the sample (from `begin` to `end`) the specified number of times.'],
  // ['f', 'lophat', ''],
  // ['f', 'lsnare', ''],
-  ['f', 'n', 'The note or sample number to choose for a synth or sampleset'],
-  ['f', 'note', 'The note or pitch to play a sound or synth with'],
-  ['f', 'degree', ''],
-  ['f', 'mtranspose', ''],
-  ['f', 'ctranspose', ''],
-  ['f', 'harmonic', ''],
-  ['f', 'stepsPerOctave', ''],
-  ['f', 'octaveR', ''],
+  ['f', 'degree', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'mtranspose', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'ctranspose', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'harmonic', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'stepsPerOctave', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'octaveR', ''], // TODO: what is this? not found in tidal doc
+  // TODO: why is this needed? what's the difference to late / early?
  [
    'f',
    'nudge',
    'Nudges events into the future by the specified number of seconds. Negative numbers work up to a point as well (due to internal latency)',
  ],
+  // TODO: the following doc is just a guess, it's not documented in tidal doc.
+  /**
+   * Sets the default octave of a synth.
+   *
+   * @name octave
+   * @param {number | Pattern} octave octave number
+   * @example
+   * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
+   */
  ['i', 'octave', ''],
-  ['f', 'offset', ''],
+  ['f', 'offset', ''], // TODO: what is this? not found in tidal doc
  // ['f', 'ophatdecay', ''],
+  // TODO: example
+  /**
+   * a pattern of numbers. An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share hardware output bus offset and global effects, e.g. reverb and delay. The maximum number of orbits is specified in the superdirt startup, numbers higher than maximum will wrap around.
+   *
+   * @name orbit
+   * @param {number | Pattern} number
+   *
+   */
  [
    'i',
    'orbit',
    'a pattern of numbers. An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share hardware output bus offset and global effects, e.g. reverb and delay. The maximum number of orbits is specified in the superdirt startup, numbers higher than maximum will wrap around.',
  ],
-  ['f', 'overgain', ''],
-  ['f', 'overshape', ''],
+  ['f', 'overgain', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'overshape', ''], // TODO: what is this? not found in tidal doc
+  /**
+   * Sets position in stereo.
+   *
+   * @name pan
+   * @param {number | Pattern} pan between 0 and 1, from left to right (assuming stereo), once round a circle (assuming multichannel)
+   * @example
+   * s("[bd hh]*2").pan("<.5 1 .5 0>").osc()
+   *
+   */
  [
    'f',
    'pan',
    'a pattern of numbers between 0 and 1, from left to right (assuming stereo), once round a circle (assuming multichannel)',
  ],
+  // TODO: this has no effect (see example)
+  /*
+   * Controls how much multichannel output is fanned out
+   *
+   * @name panspan
+   * @param {number | Pattern} span between -inf and inf, negative is backwards ordering
+   * @example
+   * s("[bd hh]*2").pan("<.5 1 .5 0>").panspan("<0 .5 1>").osc()
+   *
+   */
  [
    'f',
    'panspan',
    'a pattern of numbers between -inf and inf, which controls how much multichannel output is fanned out (negative is backwards ordering)',
  ],
+  // TODO: this has no effect (see example)
+  /*
+   * Controls how much multichannel output is spread
+   *
+   * @name pansplay
+   * @param {number | Pattern} spread between 0 and 1
+   * @example
+   * s("[bd hh]*2").pan("<.5 1 .5 0>").pansplay("<0 .5 1>").osc()
+   *
+   */
  [
    'f',
    'pansplay',
@@ -167,68 +545,163 @@ const generic_params = [
  // ['f', 'pitch2', ''],
  // ['f', 'pitch3', ''],
  // ['f', 'portamento', ''],
+  // TODO: LFO rate see https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
  ['f', 'rate', "used in SuperDirt softsynths as a control rate or 'speed'"],
-  [
-    'f',
-    'release',
-    'a pattern of numbers to specify the release time (in seconds) of an envelope applied to each sample.',
-  ],
-  ['f', 'resonance', 'a pattern of numbers from 0 to 1. Specifies the resonance of the low-pass filter.'],
-  ['f', 'room', 'a pattern of numbers from 0 to 1. Sets the level of reverb.'],
-  // ['f', 'sagogo', ''],
-  // ['f', 'sclap', ''],
-  // ['f', 'sclaves', ''],
-  // ['f', 'scrash', ''],
+  // TODO: slide param for certain synths
+  ['f', 'slide', ''],
+  // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
  ['f', 'semitone', ''],
-  [
-    'f',
-    'shape',
-    'wave shaping distortion, a pattern of numbers from 0 for no distortion up to 1 for loads of distortion.',
-  ],
+  // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
+  ['f', 'velocity', ''],
+  ['f', 'voice', ''], // TODO: synth param
+  /**
+   * Sets the level of reverb.
+   *
+   * @name room
+   * @param {number | Pattern} level between 0 and 1
+   * @example
+   * s("bd sd").room("<0 .2 .4 .6 .8 1>").osc()
+   *
+   */
+  ['f', 'room', 'a pattern of numbers from 0 to 1. Sets the level of reverb.'],
+  /**
+   * Sets the room size of the reverb, see {@link room}.
+   *
+   * @name size
+   * @param {number | Pattern} size between 0 and 1
+   * @example
+   * s("bd sd").room(.8).size("<0 .2 .4 .6 .8 1>").osc()
+   *
+   */
+  // TODO: find out why :
+  // s("bd sd").room(.8).size("<0 .2 .4 .6 .8 [1,0]>").osc()
+  // .. does not work. Is it because room is only one effect?
  [
    'f',
    'size',
    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
  ],
-  ['f', 'slide', ''],
+  // ['f', 'sagogo', ''],
+  // ['f', 'sclap', ''],
+  // ['f', 'sclaves', ''],
+  // ['f', 'scrash', ''],
+  /**
+   * Wave shaping distortion. CAUTION: it might get loud
+   *
+   * @name shape
+   * @param {number | Pattern} distortion between 0 and 1
+   * @example
+   * s("bd sd").shape("<0 .2 .4 .6 .8 1>").osc()
+   *
+   */
+  [
+    'f',
+    'shape',
+    'wave shaping distortion, a pattern of numbers from 0 for no distortion up to 1 for loads of distortion.',
+  ],
+  /**
+   * Changes the speed of sample playback, i.e. a cheap way of changing pitch.
+   *
+   * @name speed
+   * @param {number | Pattern} speed -inf to inf, negative numbers play the sample backwards.
+   * @example
+   * s("bd").speed("<1 2 4 1 -2 -4>").osc()
+   * @example
+   * speed("1 1.5*2 [2 1.1]").s("sax").cut(1).osc()
+   *
+   */
  [
    'f',
    'speed',
    'a pattern of numbers which changes the speed of sample playback, i.e. a cheap way of changing pitch. Negative values will play the sample backwards!',
  ],
-  ['f', 'squiz', ''],
-  ['f', 'stutterdepth', ''],
-  ['f', 'stuttertime', ''],
-  ['f', 'sustain', ''],
-  ['f', 'timescale', ''],
-  ['f', 'timescalewin', ''],
-  // ['f', 'tomdecay', ''],
+  /**
+   * Used in conjunction with {@link speed}, accepts values of "r" (rate, default behavior), "c" (cycles), or "s" (seconds). Using `unit "c"` means `speed` will be interpreted in units of cycles, e.g. `speed "1"` means samples will be stretched to fill a cycle. Using `unit "s"` means the playback speed will be adjusted so that the duration is the number of seconds specified by `speed`.
+   *
+   * @name unit
+   * @param {number | string | Pattern} unit see description above
+   * @example
+   * speed("1 2 .5 3").s("bd").unit("c").osc()
+   *
+   */
  [
    's',
    'unit',
    'used in conjunction with `speed`, accepts values of "r" (rate, default behavior), "c" (cycles), or "s" (seconds). Using `unit "c"` means `speed` will be interpreted in units of cycles, e.g. `speed "1"` means samples will be stretched to fill a cycle. Using `unit "s"` means the playback speed will be adjusted so that the duration is the number of seconds specified by `speed`.',
  ],
-  ['f', 'velocity', ''],
+  /**
+   * Made by Calum Gunn. Reminiscent of some weird mixture of filter, ring-modulator and pitch-shifter. The SuperCollider manual defines Squiz as:
+   *
+   * "A simplistic pitch-raising algorithm. It's not meant to sound natural; its sound is reminiscent of some weird mixture of filter, ring-modulator and pitch-shifter, depending on the input. The algorithm works by cutting the signal into fragments (delimited by upwards-going zero-crossings) and squeezing those fragments in the time domain (i.e. simply playing them back faster than they came in), leaving silences inbetween. All the parameters apart from memlen can be modulated."
+   *
+   * @name squiz
+   * @param {number | Pattern} squiz Try passing multiples of 2 to it - 2, 4, 8 etc.
+   * @example
+   * squiz("2 4/2 6 [8 16]").s("bd").osc()
+   *
+   */
+  ['f', 'squiz', ''],
+  ['f', 'stutterdepth', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'stuttertime', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'timescale', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'timescalewin', ''], // TODO: what is this? not found in tidal doc
+  // ['f', 'tomdecay', ''],
  // ['f', 'vcfegint', ''],
  // ['f', 'vcoegint', ''],
-  ['f', 'voice', ''],
+  /**
+   *
+   * Formant filter to make things sound like vowels.
+   *
+   * @name vowel
+   * @param {string | Pattern} vowel You can use a e i o u. Use a rest (~) to override the effect
+   * @example
+   * vowel("a e i [o u]").slow(2)
+   * .n("<[0,7]!4 [2,7]!4>")
+   * .s('supersquare').osc()
+   *
+   */
  [
    's',
    'vowel',
    'formant filter to make things sound like vowels, a pattern of either `a`, `e`, `i`, `o` or `u`. Use a rest (`~`) for no effect.',
  ],
+  /* // TODO: find out how it works
+   * Made by Calum Gunn. Divides an audio stream into tiny segments, using the signal's zero-crossings as segment boundaries, and discards a fraction of them. Takes a number between 1 and 100, denoted the percentage of segments to drop. The SuperCollider manual describes the Waveloss effect this way:
+   *
+   * Divide an audio stream into tiny segments, using the signal's zero-crossings as segment boundaries, and discard a fraction of them (i.e. replace them with silence of the same length). The technique was described by Trevor Wishart in a lecture. Parameters: the filter drops drop out of out of chunks. mode can be 1 to drop chunks in a simple deterministic fashion (e.g. always dropping the first 30 out of a set of 40 segments), or 2 to drop chunks randomly but in an appropriate proportion.)
+   *
+   * mode: ?
+   * waveloss: ?
+   *
+   * @name waveloss
+   */
  ['f', 'waveloss', ''],
+  // TODO: midi effects?
  ['f', 'dur', ''],
  // ['f', 'modwheel', ''],
  ['f', 'expression', ''],
  ['f', 'sustainpedal', ''],
+  /* // TODO: doesn't seem to do anything
+   *
+   * Tremolo Audio DSP effect
+   *
+   * @name tremolodepth
+   * @param {number | Pattern} depth between 0 and 1
+   * @example
+   * n("0,4,7").tremolodepth("<0 .3 .6 .9>").osc()
+   *
+   */
+  // TODO: tremdp alias
  ['f', 'tremolodepth', "Tremolo Audio DSP effect | params are 'tremolorate' and 'tremolodepth'"],
  ['f', 'tremolorate', "Tremolo Audio DSP effect | params are 'tremolorate' and 'tremolodepth'"],
+  // TODO: doesn't seem to do anything
  ['f', 'phaserdepth', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],
  ['f', 'phaserrate', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],
+
  ['f', 'fshift', 'frequency shifter'],
  ['f', 'fshiftnote', 'frequency shifter'],
  ['f', 'fshiftphase', 'frequency shifter'],
+
  ['f', 'triode', 'tube distortion'],
  ['f', 'krush', 'shape/bass enhancer'],
  ['f', 'kcutoff', ''],
@@ -271,18 +744,34 @@ const generic_params = [
  ['f', 'uid', ''],
  ['f', 'val', ''],
  ['f', 'cps', ''],
+  ['f', 'clip', ''],
 ];

+// TODO: slice / splice https://www.youtube.com/watch?v=hKhPdO0RKDQ&list=PL2lW1zNIIwj3bDkh-Y3LUGDuRcoUigoDs&index=13
+
 const _name = (name, ...pats) => sequence(...pats).withValue((x) => ({ [name]: x }));

-const _unionise = (func) =>
+const _setter = (func, name) =>
  function (...pats) {
-    return this.union(func(...pats));
+    if (!pats.length) {
+      return this.fmap((value) => ({ [name]: value }));
+    }
+    return this.set(func(...pats));
  };

 generic_params.forEach(([type, name, description]) => {
  controls[name] = (...pats) => _name(name, ...pats);
-  Pattern.prototype[name] = _unionise(controls[name]);
+  Pattern.prototype[name] = _setter(controls[name], name);
 });

+// create custom param
+controls.createParam = (name) => {
+  const func = (...pats) => _name(name, ...pats);
+  Pattern.prototype[name] = _setter(func, name);
+  return (...pats) => _name(name, ...pats);
+};
+
+controls.createParams = (...names) =>
+  names.reduce((acc, name) => Object.assign(acc, { [name]: createParam(name) }), {});
+
 export default controls;
@@ -0,0 +1,61 @@
+/*
+drawLine.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/drawLine.mjs>
+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/>.
+*/
+
+import Fraction, { gcd } from './fraction.mjs';
+
+/**
+ * Intended for a debugging, drawLine renders the pattern as a string, where each character represents the same time span.
+ * Should only be used with single characters as values, otherwise the character slots will be messed up.
+ * Character legend:
+ *
+ * - "|" cycle separator
+ * - "-" hold previous value
+ * - "." silence
+ *
+ * @param {Pattern} pattern the pattern to use
+ * @param {number} chars max number of characters (approximately)
+ * @returns string
+ * @example
+ * const line = drawLine("0 [1 2 3]", 10); // |0--123|0--123
+ * console.log(line);
+ */
+function drawLine(pat, chars = 60) {
+  let cycle = 0;
+  let pos = Fraction(0);
+  let lines = [''];
+  let emptyLine = ''; // this will be the "reference" empty line, which will be copied into extra lines
+  while (lines[0].length < chars) {
+    const haps = pat.queryArc(cycle, cycle + 1);
+    const durations = haps.filter((hap) => hap.hasOnset()).map((hap) => hap.duration);
+    const charFraction = gcd(...durations);
+    const totalSlots = charFraction.inverse(); // number of character slots for the current cycle
+    lines = lines.map((line) => line + '|'); // add pipe character before each cycle
+    emptyLine += '|';
+    for (let i = 0; i < totalSlots; i++) {
+      const [begin, end] = [pos, pos.add(charFraction)];
+      const matches = haps.filter((hap) => hap.whole.begin.lte(begin) && hap.whole.end.gte(end));
+      const missingLines = matches.length - lines.length;
+      if (missingLines > 0) {
+        lines = lines.concat(Array(missingLines).fill(emptyLine));
+      }
+      lines = lines.map((line, i) => {
+        const hap = matches[i];
+        if (hap) {
+          const isOnset = hap.whole.begin.eq(begin);
+          const char = isOnset ? '' + hap.value : '-';
+          return line + char;
+        }
+        return line + '.';
+      });
+      emptyLine += '.';
+      pos = pos.add(charFraction);
+    }
+    cycle++;
+  }
+  return lines.join('\n');
+}
+
+export default drawLine;
@@ -1,3 +1,9 @@
+/*
+euclid.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/euclid.mjs>
+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/>.
+*/
+
 import { Pattern, timeCat } from './pattern.mjs';
 import bjork from 'bjork';
 import { rotate } from './util.mjs';
@@ -11,10 +17,70 @@ const euclid = (pulses, steps, rotation = 0) => {
  return b;
 };

+/**
+ * Changes the structure of the pattern to form an euclidean rhythm.
+ * Euclidian rhythms are rhythms obtained using the greatest common divisor of two numbers.
+ * They were described in 2004 by Godfried Toussaint, a canadian computer scientist.
+ * Euclidian rhythms are really useful for computer/algorithmic music because they can accurately
+ * describe a large number of rhythms used in the most important music world traditions.
+ *
+ * @memberof Pattern
+ * @param {number} pulses the number of onsets / beats
+ * @param {number} steps the number of steps to fill
+ * @param {number} rotation (optional) offset in steps
+ * @returns Pattern
+ * @example // The Cuban tresillo pattern.
+ * "c3".euclid(3,8)
+ * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
+ * "c3".euclid(2,5)
+ * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
+ * "c3".euclid(3,4)
+ * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
+ * "c3".euclid(3,5,2)
+ * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
+ * "c3".euclid(3,7)
+ * @example // The Cuban tresillo pattern.
+ * "c3".euclid(3,8)
+ * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
+ * "c3".euclid(4,7)
+ * @example // The Aksak rhythm of Turkey.
+ * "c3".euclid(4,9)
+ * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
+ * "c3".euclid(4,11)
+ * @example // Yields the York-Samai pattern, a popular Arab rhythm.
+ * "c3".euclid(5,6)
+ * @example // The Nawakhat pattern, another popular Arab rhythm.
+ * "c3".euclid(5,7)
+ * @example // The Cuban cinquillo pattern.
+ * "c3".euclid(5,8)
+ * @example // A popular Arab rhythm called Agsag-Samai.
+ * "c3".euclid(5,9)
+ * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
+ * "c3".euclid(5,11)
+ * @example // The Venda clapping pattern of a South African children’s song.
+ * "c3".euclid(5,12)
+ * @example // The Bossa-Nova rhythm necklace of Brazil.
+ * "c3".euclid(5,16)
+ * @example // A typical rhythm played on the Bendir (frame drum).
+ * "c3".euclid(7,8)
+ * @example // A common West African bell pattern.
+ * "c3".euclid(7,12)
+ * @example // A Samba rhythm necklace from Brazil.
+ * "c3".euclid(7,16,14)
+ * @example // A rhythm necklace used in the Central African Republic.
+ * "c3".euclid(9,16)
+ * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
+ * "c3".euclid(11,24,14)
+ * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
+ * "c3".euclid(13,24,5)
+ */
 Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
  return this.struct(euclid(pulses, steps, rotation));
 };

+/**
+ * Similar to {@link Pattern#euclid}, but each pulse is held until the next pulse, so there will be no gaps.
+ */
 Pattern.prototype.euclidLegato = function (pulses, steps, rotation = 0) {
  const bin_pat = euclid(pulses, steps, rotation);
  const firstOne = bin_pat.indexOf(1);
@@ -27,7 +27,7 @@
      const events = pattern.firstCycle(); // query first cycle
      events.forEach((event) => {
        ctx.fillStyle = event.value;
-        ctx.fillRect(event.whole.begin * canvas.width, 0, event.duration * canvas.width, canvas.height);
+        ctx.fillRect(event.whole.begin * canvas.width, 0, event.duration.valueOf() * canvas.width, canvas.height);
      });
    }
  </script>
@@ -1,3 +1,9 @@
+/*
+fraction.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/fraction.mjs>
+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/>.
+*/
+
 import Fraction from 'fraction.js';
 import { TimeSpan } from './timespan.mjs';

@@ -72,6 +78,12 @@ const fraction = (n) => {
  return Fraction(n);
 };

+export const gcd = (...fractions) => {
+  return fractions.reduce((gcd, fraction) => gcd.gcd(fraction), fraction(1));
+};
+
+fraction._original = Fraction;
+
 export default fraction;

 // "If you concern performance, cache Fraction.js objects and pass arrays/objects.“
@@ -1,6 +1,12 @@
+/*
+gist.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/gist.js>
+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/>.
+*/
+
 // this is a shortcut to eval code from a gist
 // why? to be able to shorten strudel code + e.g. be able to change instruments after links have been generated
-export default (route) =>
-  fetch(`https://gist.githubusercontent.com/${route}?cachebust=${Date.now()}`)
+export default (route, cache = true) =>
+  fetch(`https://gist.githubusercontent.com/${route}?cachebust=${cache ? '' : Date.now()}`)
    .then((res) => res.text())
    .then((code) => eval(code));
@@ -1,3 +1,8 @@
+/*
+hap.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/hap.mjs>
+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 {
  /*
@@ -9,7 +14,10 @@ export class Hap {
      then the whole will be returned as None, in which case the given
      value will have been sampled from the point halfway between the
      start and end of the 'part' timespan.
-      The context is to store a list of source code locations causing the event
+      The context is to store a list of source code locations causing the event.
+
+      The word 'Event' is more or less a reserved word in javascript, hence this
+      class is named called 'Hap'.
      */

  constructor(whole, part, value, context = {}, stateful = false) {
@@ -24,7 +32,7 @@ export class Hap {
  }

  get duration() {
-    return this.whole.end.sub(this.whole.begin).valueOf();
+    return this.whole.end.sub(this.whole.begin);
  }

  wholeOrPart() {
@@ -32,18 +40,18 @@ export class Hap {
  }

  withSpan(func) {
-    // Returns a new event with the function f applies to the event timespan.
+    // Returns a new hap with the function f applies to the hap timespan.
    const whole = this.whole ? func(this.whole) : undefined;
    return new Hap(whole, func(this.part), this.value, this.context);
  }

  withValue(func) {
-    // Returns a new event with the function f applies to the event value.
+    // Returns a new hap with the function f applies to the hap value.
    return new Hap(this.whole, this.part, func(this.value), this.context);
  }

  hasOnset() {
-    // Test whether the event contains the onset, i.e that
+    // Test whether the hap contains the onset, i.e that
    // the beginning of the part is the same as that of the whole timespan."""
    return this.whole != undefined && this.whole.begin.equals(this.part.begin);
  }
@@ -77,6 +85,12 @@ export class Hap {
    );
  }

+  showWhole() {
+    return `${this.whole == undefined ? '~' : this.whole.show()}: ${
+      typeof this.value === 'object' ? JSON.stringify(this.value) : this.value
+    }`;
+  }
+
  combineContext(b) {
    const a = this;
    return { ...a.context, ...b.context, locations: (a.context.locations || []).concat(b.context.locations || []) };
@@ -87,4 +101,4 @@ export class Hap {
  }
 }

-export default Hap;
+export default Hap;
@@ -1,11 +1,33 @@
+/*
+index.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/index.mjs>
+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 * 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';
 export * from './state.mjs';
 export * from './timespan.mjs';
 export * from './util.mjs';
-// export * from './value.mjs';
+export * from './speak.mjs';
+export { default as gist } from './gist.js';
+// below won't work with runtime.mjs (json import fails)
+/* import * as p from './package.json';
+export const version = p.version; */
+console.log(
+  '%c // 🌀 @strudel.cycles/core loaded 🌀', // keep "//" for runnable snapshot source..
+  'background-color: black;color:white;padding:4px;border-radius:15px',
+);
+if (globalThis._strudelLoaded) {
+  console.warn(
+    `@strudel.cycles/core was loaded more than once...
+This might happen when you have multiple versions of strudel installed. 
+Please check with "npm ls @strudel.cycles/core".`,
+  );
+}
+globalThis._strudelLoaded = true;
@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.0.5",
+	"version": "0.1.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/core",
-			"version": "0.0.3",
-			"license": "GPL-3.0-or-later",
+			"version": "0.1.0",
+			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"bjork": "^0.0.1",
 				"fraction.js": "^4.2.0"
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/core",
-  "version": "0.0.5",
+  "version": "0.1.2",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -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"
  },
@@ -1,3 +1,9 @@
+/*
+signal.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/signal.mjs>
+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/>.
+*/
+
 import { Hap } from './hap.mjs';
 import { Pattern, fastcat, reify, silence, stack } from './pattern.mjs';
 import Fraction from './fraction.mjs';
@@ -5,7 +11,7 @@ import { id } from './util.mjs';

 export function steady(value) {
  // A continuous value
-  return new Pattern((span) => Hap(undefined, span, value));
+  return new Pattern((state) => [new Hap(undefined, state.span, value)]);
 }

 export const signal = (func) => {
@@ -16,17 +22,63 @@ export const signal = (func) => {
 export const isaw = signal((t) => 1 - (t % 1));
 export const isaw2 = isaw._toBipolar();

+/**
+ *  A sawtooth signal between 0 and 1.
+ *
+ * @return {Pattern}
+ * @example
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4))
+ * @example
+ * saw.range(0,8).segment(8).scale('C major').slow(4)
+ *
+ */
 export const saw = signal((t) => t % 1);
 export const saw2 = saw._toBipolar();

 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
+
+/**
+ *  A sine signal between 0 and 1.
+ *
+ * @return {Pattern}
+ * @example
+ * sine.segment(16).range(0,15).slow(2).scale('C minor')
+ *
+ */
 export const sine = sine2._fromBipolar();
+
+
+/**
+ *  A cosine signal between 0 and 1.
+ *
+ * @return {Pattern}
+ * @example
+ * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor')
+ *
+ */
 export const cosine = sine._early(Fraction(1).div(4));
 export const cosine2 = sine2._early(Fraction(1).div(4));

+
+/**
+ *  A square signal between 0 and 1.
+ *
+ * @return {Pattern}
+ * @example
+ * square.segment(2).range(0,7).scale('C minor')
+ *
+ */
 export const square = signal((t) => Math.floor((t * 2) % 2));
 export const square2 = square._toBipolar();

+/**
+ *  A triangle signal between 0 and 1.
+ *
+ * @return {Pattern}
+ * @example
+ * triangle.segment(2).range(0,7).scale('C minor')
+ *
+ */
 export const tri = fastcat(isaw, saw);
 export const tri2 = fastcat(isaw2, saw2);

@@ -47,7 +99,7 @@ const timeToIntSeed = (x) => xorwise(Math.trunc(_frac(x / 300) * 536870912));

 const intSeedToRand = (x) => (x % 536870912) / 536870912;

-const timeToRand = (x) => intSeedToRand(timeToIntSeed(x));
+const timeToRand = (x) => Math.abs(intSeedToRand(timeToIntSeed(x)));

 const timeToRandsPrime = (seed, n) => {
  const result = [];
@@ -60,8 +112,7 @@ const timeToRandsPrime = (seed, n) => {

 const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);

-export const rand2 = signal(timeToRand);
-export const rand = rand2.fmap(Math.abs);
+export const rand = signal(timeToRand);

 export const _brandBy = (p) => rand.fmap((x) => x < p);
 export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
@@ -71,14 +122,40 @@ export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
 export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();

 export const chooseWith = (pat, xs) => {
+  xs = xs.map(reify);
  if (xs.length == 0) {
    return silence;
  }
-  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]);
+  return pat
+    .range(0, xs.length)
+    .fmap((i) => xs[Math.floor(i)])
+    .outerJoin();
 };

 export const choose = (...xs) => chooseWith(rand, xs);

+const _wchooseWith = function (pat, ...pairs) {
+  const values = pairs.map((pair) => reify(pair[0]));
+  const weights = [];
+  let accum = 0;
+  for (const pair of pairs) {
+    accum += pair[1];
+    weights.push(accum);
+  }
+  const total = accum;
+  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();
+
+export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
+
+export const wchooseCycles = (...pairs) => _wchooseWith(rand, ...pairs).innerJoin();
+
 export const perlinWith = (pat) => {
  const pata = pat.fmap(Math.floor);
  const patb = pat.fmap((t) => Math.floor(t) + 1);
@@ -142,6 +219,24 @@ Pattern.prototype.sometimesPre = function (func) {
  return this._sometimesByPre(0.5, func);
 };

+Pattern.prototype._someCyclesBy = function (x, func) {
+  return stack(
+    this._degradeByWith(rand._segment(1), x),
+    func(this._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
+  );
+};
+
+Pattern.prototype.someCyclesBy = function (patx, func) {
+  const pat = this;
+  return reify(patx)
+    .fmap((x) => pat._someCyclesBy(x, func))
+    .innerJoin();
+};
+
+Pattern.prototype.someCycles = function (func) {
+  return this._someCyclesBy(0.5, func);
+};
+
 Pattern.prototype.often = function (func) {
  return this.sometimesBy(0.75, func);
 };
@@ -1,6 +1,18 @@
+/*
+speak.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/speak.mjs>
+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/>.
+*/
+
 import { Pattern, patternify2 } from './index.mjs';

-const synth = window?.speechSynthesis;
+let synth;
+try {
+  synth = window?.speechSynthesis;
+} catch (err) {
+  console.warn('cannot use window: not in browser?');
+}
+
 let allVoices = synth?.getVoices();
 // console.log('voices', allVoices);

@@ -20,11 +32,11 @@ function speak(words, lang, voice) {
 }

 Pattern.prototype._speak = function (lang, voice) {
-  return this._withEvent((event) => {
-    const onTrigger = (time, event) => {
-      speak(event.value, lang, voice);
+  return this._withHap((hap) => {
+    const onTrigger = (time, hap) => {
+      speak(hap.value, lang, voice);
    };
-    return event.setContext({ ...event.context, onTrigger });
+    return hap.setContext({ ...hap.context, onTrigger });
  });
 };

@@ -1,3 +1,9 @@
+/*
+state.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/state.mjs>
+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 State {
  constructor(span, controls = {}) {
    this.span = span;
@@ -0,0 +1,56 @@
+/*
+drawLine.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/drawLine.test.mjs>
+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/>.
+*/
+
+import { fastcat, stack, slowcat, silence, pure } from '../pattern.mjs';
+import { strict as assert } from 'assert';
+import drawLine from '../drawLine.mjs';
+
+describe('drawLine', () => {
+  it('supports equal lengths', () => {
+    assert.equal(drawLine(fastcat(0), 4), '|0|0');
+    assert.equal(drawLine(fastcat(0, 1), 4), '|01|01');
+    assert.equal(drawLine(fastcat(0, 1, 2), 6), '|012|012');
+  });
+  it('supports unequal lengths', () => {
+    assert.equal(drawLine(fastcat(0, [1, 2]), 10), '|0-12|0-12');
+    assert.equal(drawLine(fastcat(0, [1, 2, 3]), 10), '|0--123|0--123');
+    assert.equal(drawLine(fastcat(0, 1, [2, 3]), 10), '|0-1-23|0-1-23');
+  });
+  it('supports unequal silence', () => {
+    assert.equal(drawLine(fastcat(0, silence, [1, 2]), 10), '|0-..12|0-..12');
+  });
+  it('supports polyrhythms', () => {
+    '0*2 1*3';
+    assert.equal(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10), '|0--0--1-1-1-');
+  });
+  it('supports multiple lines', () => {
+    assert.equal(
+      drawLine(fastcat(0, stack(1, 2)), 10),
+      `|01|01|01|01
+|.2|.2|.2|.2`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, 1, stack(2, 3)), 10),
+      `|012|012|012
+|..3|..3|..3`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, stack(1, 2, 3)), 10),
+      `|01|01|01|01
+|.2|.2|.2|.2
+|.3|.3|.3|.3`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, 1, stack(2, 3, 4)), 10),
+      `|012|012|012
+|..3|..3|..3
+|..4|..4|..4`,
+    );
+  });
+  it('supports unequal cycle lengths', () => {
+    assert.equal(drawLine(slowcat(0, [1, 2]), 10), `|0|12|0|12`);
+  });
+});
@@ -0,0 +1,15 @@
+/*
+fraction.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/fraction.test.mjs>
+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/>.
+*/
+
+import Fraction, { gcd } from '../fraction.mjs';
+import { strict as assert } from 'assert';
+
+describe('gcd', () => {
+  it('should work', () => {
+    const F = Fraction._original;
+    assert.equal(gcd(F(1 / 6), F(1 / 4)).toFraction(), '1/12');
+  });
+});
@@ -1,3 +1,9 @@
+/*
+pattern.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/pattern.test.mjs>
+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/>.
+*/
+
 import Fraction from 'fraction.js';

 import { deepStrictEqual, strict as assert } from 'assert';
@@ -35,7 +41,11 @@ import {
  tri2,
  id,
  ply,
+  rev
 } from '../index.mjs';
+
+import { steady } from '../signal.mjs';
+
 //import { Time } from 'tone';
 import pkg from 'tone';
 const { Time } = pkg;
@@ -47,6 +57,10 @@ const hap = (whole, part, value, context = {}) => new Hap(whole, part, value, co
 const third = Fraction(1, 3);
 const twothirds = Fraction(2, 3);

+const sameFirst = (a, b) => {
+  return assert.deepStrictEqual(a._sortHapsByPart().firstCycle(), b._sortHapsByPart().firstCycle());
+};
+
 describe('TimeSpan', function () {
  describe('equals()', function () {
    it('Should be equal to the same value', function () {
@@ -108,6 +122,18 @@ describe('Hap', function () {
      assert.deepStrictEqual(state3, { incrementme: 12 });
    });
  });
+  describe('wholeOrPart()', () => {
+    const ts1 = new TimeSpan(Fraction(0), Fraction(1));
+    const ts0_5 = new TimeSpan(Fraction(0), Fraction(0.5));
+    const continuousHap = new Hap(undefined, ts1, 'hello');
+    const discreteHap = new Hap(ts1, ts0_5, 'hello');
+    it('Can pick a whole', () => {
+      assert.deepStrictEqual(discreteHap.wholeOrPart(), ts1);
+    });
+    it('Can pick a part', () => {
+      assert.deepStrictEqual(continuousHap.wholeOrPart(), ts1);
+    });
+  });
 });

 describe('Pattern', function () {
@@ -127,8 +153,132 @@ describe('Pattern', function () {
    });
  });
  describe('add()', function () {
-    it('Can add things', function () {
+    it('can structure In()', 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);
+    });
+    it('can structure Out()', () => {
+      sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
+    });
+    it('can Mix() structure', () => {
+      assert.deepStrictEqual(sequence(1, 2).addMix(silence, 5, silence).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 6),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 7),
+      ]);
+    });
+    it('can Trig() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrig(20, 30).early(2),
+        sequence(26, 27, 36, 37),
+      );
+    });
+    it('can Trigzero() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrigzero(20, 30).early(2),
+        sequence(21, 22, 31, 32),
+      );
+    });
+    it('can Squeeze() structure', () => {
+      sameFirst(
+        sequence(1, [2, 3]).addSqueeze(sequence(10, 20, 30)),
+        sequence(
+          [11, 21, 31],
+          [
+            [12, 22, 32],
+            [13, 23, 33],
+          ],
+        ),
+      );
+    });
+    it('can SqueezeOut() structure', () => {
+      sameFirst(
+        sequence(1, [2, 3]).addSqueezeOut(10, 20, 30),
+        sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
+      );
+    });
+  });
+  describe('keep()', function () {
+    it('can structure In()', function () {
+      assert.equal(pure(3).keep(pure(4)).query(st(0, 1))[0].value, 3);
+      assert.equal(pure(3).keepIn(pure(4)).query(st(0, 1))[0].value, 3);
+    });
+    it('can structure Out()', () => {
+      sameFirst(sequence(1, 2).keepOut(4), sequence(1, 2).struct(true));
+    });
+    it('can Mix() structure', () => {
+      assert.deepStrictEqual(sequence(1, 2).keepMix(silence, 5, silence).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
+      ]);
+    });
+    it('can Trig() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrig(20, 30).early(2),
+        sequence(6, 7, 6, 7),
+      );
+    });
+    it('can Trigzero() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrigzero(20, 30).early(2),
+        sequence(1, 2, 1, 2),
+      );
+    });
+    it('can Squeeze() structure', () => {
+      sameFirst(
+        sequence(1, [2, 3]).keepSqueeze(sequence(10, 20, 30)),
+        sequence(
+          [1, 1, 1],
+          [
+            [2, 2, 2],
+            [3, 3, 3],
+          ],
+        ),
+      );
+    });
+    it('can SqueezeOut() structure', () => {
+      sameFirst(sequence(1, [2, 3]).keepSqueezeOut(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
+    });
+  });
+  describe('keepif()', function () {
+    it('can structure In()', function () {
+      sameFirst(sequence(3, 4).keepif(true, false), sequence(3, silence));
+      sameFirst(sequence(3, 4).keepifIn(true, false), sequence(3, silence));
+    });
+    it('can structure Out()', () => {
+      sameFirst(pure(1).keepifOut(true, false), sequence(1, silence));
+    });
+    it('can Mix() structure', () => {
+      assert.deepStrictEqual(sequence(1, 2).keepifMix(false, true, false).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
+      ]);
+    });
+    it('can Trig() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrig(false, true).early(2),
+        sequence(silence, silence, 6, 7),
+      );
+    });
+    it('can Trigzero() structure', () => {
+      sameFirst(
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrigzero(false, true).early(2),
+        sequence(silence, silence, 1, 2),
+      );
+    });
+    it('can Squeeze() structure', () => {
+      sameFirst(
+        sequence(1, [2, 3]).keepifSqueeze(sequence(true, true, false)),
+        sequence(
+          [1, 1, silence],
+          [
+            [2, 2, silence],
+            [3, 3, silence],
+          ],
+        ),
+      );
+    });
+    it('can SqueezeOut() structure', () => {
+      sameFirst(sequence(1, [2, 3]).keepifSqueezeOut(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
    });
  });
  describe('sub()', function () {
@@ -146,14 +296,50 @@ describe('Pattern', function () {
      assert.equal(pure(3).div(pure(2)).firstCycle()[0].value, 1.5);
    });
  });
-  describe('union()', function () {
-    it('Can union things', function () {
+  describe('set()', function () {
+    it('Can set things in objects', function () {
      assert.deepStrictEqual(
        pure({ a: 4, b: 6 })
-          .union(pure({ c: 7 }))
+          .set(pure({ c: 7 }))
          .firstCycle()[0].value,
        { a: 4, b: 6, c: 7 },
      );
+      sameFirst(
+        sequence({ a: 1, b: 2 }, { a: 2, b: 2 }, { a: 3, b: 2 }).set({ a: 4, c: 5 }),
+        sequence({ a: 4, b: 2, c: 5 }).fast(3),
+      );
+    });
+    it('Can set things with plain values', function () {
+      sameFirst(sequence(1, 2, 3).set(4), sequence(4).fast(3));
+    });
+    describe('setOut()', () => {
+      it('Can set things with structure from second pattern', () => {
+        sameFirst(sequence(1, 2).setOut(4), pure(4).mask(true, true));
+      });
+    });
+    describe('setSqueeze()', () => {
+      it('Can squeeze one pattern inside the haps of another', () => {
+        sameFirst(
+          sequence(1, [2, 3]).setSqueeze(sequence('a', 'b', 'c')),
+          sequence(
+            ['a', 'b', 'c'],
+            [
+              ['a', 'b', 'c'],
+              ['a', 'b', 'c'],
+            ],
+          ),
+        );
+        sameFirst(
+          sequence(1, [2, 3]).setSqueeze('a', 'b', 'c'),
+          sequence(
+            ['a', 'b', 'c'],
+            [
+              ['a', 'b', 'c'],
+              ['a', 'b', 'c'],
+            ],
+          ),
+        );
+      });
    });
  });
  describe('stack()', function () {
@@ -165,6 +351,9 @@ describe('Pattern', function () {
        ['a', 'b', 'c'],
      );
    });
+    it('Can stack subpatterns', function () {
+      sameFirst(stack('a', ['b', 'c']), stack('a', sequence('b', 'c')));
+    });
  });
  describe('_fast()', function () {
    it('Makes things faster', function () {
@@ -203,7 +392,7 @@ describe('Pattern', function () {
    });
    it('Makes things faster, with a pattern of factors', function () {
      assert.equal(pure('a').fast(sequence(1, 4)).firstCycle().length, 3);
-      // .fast(sequence(1,silence) is a quick hack to cut an event in two..
+      // .fast(sequence(1,silence) is a quick hack to cut a hap in two..
      assert.deepStrictEqual(
        pure('a').fast(sequence(1, 4)).firstCycle(),
        stack(pure('a').fast(sequence(1, silence)), sequence(silence, ['a', 'a'])).firstCycle(),
@@ -248,6 +437,20 @@ describe('Pattern', function () {
      // mini('eb3 [c3 g3]/2 ') always plays [c3 g3]
    });
  });
+  describe('inside', () => {
+    it('can rev inside a cycle', () => {
+      sameFirst(sequence('a', 'b', 'c', 'd').inside(2, rev),
+        sequence('b', 'a', 'd', 'c')
+      );
+    });
+  });
+  describe('outside', () => {
+    it('can rev outside a cycle', () => {
+      sameFirst(sequence('a', 'b', 'c', 'd')._slow(2).outside(2, rev),
+        sequence('d', 'c')
+      );
+    });
+  });
  describe('_filterValues()', function () {
    it('Filters true', function () {
      assert.equal(
@@ -277,7 +480,7 @@ describe('Pattern', function () {
    });
    it('Can alternate', function () {
      assert.deepStrictEqual(
-        pure(10).when(slowcat(true, false), add(3)).fast(4)._sortEventsByPart().firstCycle(),
+        pure(10).when(slowcat(true, false), add(3)).fast(4)._sortHapsByPart().firstCycle(),
        fastcat(13, 10, 13, 10).firstCycle(),
      );
    });
@@ -292,6 +495,11 @@ describe('Pattern', function () {
      );
    });
  });
+  describe('fastcat()', function () {
+    it('Can go into negative time', function () {
+      sameFirst(fastcat('a', 'b', 'c').late(1000000), fastcat('a', 'b', 'c'));
+    });
+  });
  describe('slowcat()', function () {
    it('Can concatenate things slowly', function () {
      assert.deepStrictEqual(
@@ -322,6 +530,9 @@ describe('Pattern', function () {
        ['c'],
      );
    });
+    it('Can cat subpatterns', () => {
+      sameFirst(slowcat('a', ['b', 'c']).fast(4), sequence('a', ['b', 'c']).fast(2));
+    });
  });
  describe('rev()', function () {
    it('Can reverse things', function () {
@@ -390,6 +601,11 @@ describe('Pattern', function () {
      );
    });
  });
+  describe('brak()', () => {
+    it('Can make something a bit breakbeaty', () => {
+      sameFirst(sequence('a', 'b').brak()._fast(2), sequence('a', 'b', fastcat(silence, 'a'), fastcat('b', silence)));
+    });
+  });
  describe('timeCat()', function () {
    it('Can concatenate patterns with different relative durations', function () {
      assert.deepStrictEqual(
@@ -399,7 +615,7 @@ describe('Pattern', function () {
    });
  });
  describe('struct()', function () {
-    it('Can restructure a pattern', function () {
+    it('Can restructure a discrete pattern', function () {
      assert.deepStrictEqual(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle(), [
        hap(ts(0, third), ts(0, third), 'a'),
        hap(ts(third, twothirds), ts(third, 0.5), 'a'),
@@ -425,6 +641,12 @@ describe('Pattern', function () {
        sequence('a', ['a', silence], 'a').firstCycle(),
      );
    });
+    it('Can structure a continuous pattern', () => {
+      assert.deepStrictEqual(
+        steady('a').struct(true, [true, true]).firstCycle(),
+        sequence('a', ['a', 'a']).firstCycle(),
+      );
+    });
  });
  describe('mask()', function () {
    it('Can fragment a pattern', function () {
@@ -474,7 +696,7 @@ describe('Pattern', function () {
    });
  });
  describe('_setContext()', () => {
-    it('Can set the event context', () => {
+    it('Can set the hap context', () => {
      assert.deepStrictEqual(
        pure('a')
          ._setContext([
@@ -496,7 +718,7 @@ describe('Pattern', function () {
    });
  });
  describe('_withContext()', () => {
-    it('Can update the event context', () => {
+    it('Can update the hap context', () => {
      assert.deepStrictEqual(
        pure('a')
          ._setContext([
@@ -551,13 +773,13 @@ describe('Pattern', function () {
    });
  });
  describe('early', () => {
-    it('Can shift an event earlier', () => {
+    it('Can shift a hap earlier', () => {
      assert.deepStrictEqual(pure(30)._late(0.25).query(st(1, 2)), [
        hap(ts(1 / 4, 5 / 4), ts(1, 5 / 4), 30),
        hap(ts(5 / 4, 9 / 4), ts(5 / 4, 2), 30),
      ]);
    });
-    it('Can shift an event earlier, into negative time', () => {
+    it('Can shift a hap earlier, into negative time', () => {
      assert.deepStrictEqual(pure(30)._late(0.25).query(st(0, 1)), [
        hap(ts(-3 / 4, 1 / 4), ts(0, 1 / 4), 30),
        hap(ts(1 / 4, 5 / 4), ts(1 / 4, 1), 30),
@@ -575,9 +797,9 @@ describe('Pattern', function () {
  describe('jux', () => {
    it('Can juxtapose', () => {
      assert.deepStrictEqual(
-        pure({ a: 1 }).jux(fast(2))._sortEventsByPart().firstCycle(),
+        pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle(),
        stack(pure({ a: 1, pan: 0 }), pure({ a: 1, pan: 1 }).fast(2))
-          ._sortEventsByPart()
+          ._sortHapsByPart()
          .firstCycle(),
      );
    });
@@ -585,9 +807,9 @@ describe('Pattern', function () {
  describe('juxBy', () => {
    it('Can juxtapose by half', () => {
      assert.deepStrictEqual(
-        pure({ a: 1 }).juxBy(0.5, fast(2))._sortEventsByPart().firstCycle(),
+        pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle(),
        stack(pure({ a: 1, pan: 0.25 }), pure({ a: 1, pan: 0.75 }).fast(2))
-          ._sortEventsByPart()
+          ._sortHapsByPart()
          .firstCycle(),
      );
    });
@@ -616,6 +838,18 @@ describe('Pattern', function () {
        sequence(pure('a').fast(3), [pure('b').fast(3), pure('c').fast(3)]).firstCycle(),
      );
    });
+    it('Doesnt drop haps in the 9th cycle', () => {
+      // fixed with https://github.com/tidalcycles/strudel/commit/72eeaf446e3d5e186d63cc0d2276f0723cde017a
+      assert.equal(sequence(1, 2, 3).ply(2).early(8).firstCycle().length, 6);
+    });
+  });
+  describe('striate', () => {
+    it('Can striate(2)', () => {
+      sameFirst(
+        sequence({ sound: 'a' }).striate(2),
+        sequence({ sound: 'a', begin: 0, end: 0.5 }, { sound: 'a', begin: 0.5, end: 1 }),
+      );
+    });
  });
  describe('chop', () => {
    it('Can _chop(2)', () => {
@@ -631,7 +865,7 @@ describe('Pattern', function () {
    });
    it('Can chop(2,3)', () => {
      assert.deepStrictEqual(
-        pure({ sound: 'a' }).fast(2).chop(2, 3)._sortEventsByPart().firstCycle(),
+        pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle(),
        sequence(
          [
            { sound: 'a', begin: 0, end: 0.5 },
@@ -643,7 +877,7 @@ describe('Pattern', function () {
            { sound: 'a', begin: 2 / 3, end: 1 },
          ],
        )
-          ._sortEventsByPart()
+          ._sortHapsByPart()
          .firstCycle(),
      );
    });
@@ -1,5 +1,12 @@
+/*
+util.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/util.test.mjs>
+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/>.
+*/
+
 import { strict as assert } from 'assert';
-import { isNote, tokenizeNote, toMidi, mod, compose } from '../util.mjs';
+import { pure } from '../pattern.mjs';
+import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency } from '../util.mjs';

 describe('isNote', () => {
  it('should recognize notes without accidentals', () => {
@@ -64,6 +71,21 @@ describe('toMidi', () => {
    assert.equal(toMidi('C##3'), 50);
  });
 });
+describe('fromMidi', () => {
+  it('should turn midi into frequency', () => {
+    assert.equal(fromMidi(69), 440);
+    assert.equal(fromMidi(57), 220);
+  });
+});
+describe('getFrequency', () => {
+  it('should turn midi into frequency', () => {
+    const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
+    assert.equal(getFrequency(happify('a4')), 440);
+    assert.equal(getFrequency(happify('a3')), 220);
+    assert.equal(getFrequency(happify(440, { type: 'frequency' })), 440); // TODO: migrate when values are objects..
+    assert.equal(getFrequency(happify(432, { type: 'frequency' })), 432);
+  });
+});

 describe('mod', () => {
  it('should work like regular modulo with positive numbers', () => {
@@ -1,3 +1,9 @@
+/*
+value.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/value.test.mjs>
+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/>.
+*/
+
 import { strict as assert } from 'assert';
 import { map, valued, mul } from '../value.mjs';

@@ -1,3 +1,9 @@
+/*
+timespan.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/timespan.mjs>
+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/>.
+*/
+
 import Fraction from './fraction.mjs';

 export class TimeSpan {
@@ -28,12 +34,16 @@ export class TimeSpan {
    return spans;
  }

+  get duration() {
+    return this.end.sub(this.begin);
+  }
+
  cycleArc() {
    // Shifts a timespan to one of equal duration that starts within cycle zero.
    // (Note that the output timespan probably does not start *at* Time 0 --
    // that only happens when the input Arc starts at an integral Time.)
    const b = this.begin.cyclePos();
-    const e = b + (this.end - this.begin);
+    const e = b.add(this.duration);
    return new TimeSpan(b, e);
  }

@@ -81,14 +91,13 @@ export class TimeSpan {
    // Like 'sect', but raises an exception if the timespans don't intersect.
    const result = this.intersection(other);
    if (result == undefined) {
-      // TODO - raise exception
-      // raise ValueError(f'TimeSpan {self} and TimeSpan {other} do not intersect')
+      throw 'TimeSpans do not intersect';
    }
    return result;
  }

  midpoint() {
-    return this.begin.add(this.end.sub(this.begin).div(Fraction(2)));
+    return this.begin.add(this.duration.div(Fraction(2)));
  }

  equals(other) {
@@ -1,10 +1,16 @@
+/*
+util.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/util.mjs>
+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/>.
+*/
+
 // returns true if the given string is a note
 export const isNote = (name) => /^[a-gA-G][#b]*[0-9]$/.test(name);
 export const tokenizeNote = (note) => {
  if (typeof note !== 'string') {
    return [];
  }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#b]*)([0-9])?$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bs]*)([0-9])?$/)?.slice(1) || [];
  if (!pc) {
    return [];
  }
@@ -18,7 +24,7 @@ export const toMidi = (note) => {
    throw new Error('not a note: "' + note + '"');
  }
  const chroma = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 }[pc.toLowerCase()];
-  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1 }[char], 0) || 0;
+  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1, s: 1 }[char], 0) || 0;
  return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const fromMidi = (n) => {
@@ -27,19 +33,35 @@ 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 < 0 ? mod(n + m, m) : n % m);
+export const mod = (n, m) => ((n % m) + m) % m;

-export const getPlayableNoteValue = (event) => {
-  let { value: note, context } = event;
+export const getPlayableNoteValue = (hap) => {
+  let { value: note, context } = hap;
  // if value is number => interpret as midi number as long as its not marked as frequency
  if (typeof note === 'number' && context.type !== 'frequency') {
-    note = fromMidi(event.value);
+    note = fromMidi(hap.value);
  } else if (typeof note === 'string' && !isNote(note)) {
    throw new Error('not a note: ' + note);
  }
  return note;
 };

+export const getFrequency = (hap) => {
+  let { value, context } = hap;
+  // if value is number => interpret as midi number as long as its not marked as frequency
+  if (typeof value === 'object' && value.freq) {
+    return value.freq;
+  }
+  if (typeof value === 'number' && context.type !== 'frequency') {
+    value = fromMidi(hap.value);
+  } else if (typeof value === 'string' && isNote(value)) {
+    value = fromMidi(toMidi(hap.value));
+  } else if (typeof value !== 'number') {
+    throw new Error('not a note or frequency:' + value);
+  }
+  return value;
+};
+
 // rotate array by n steps (to the left)
 export const rotate = (arr, n) => arr.slice(n).concat(arr.slice(0, n));

@@ -1,6 +1,12 @@
+/*
+value.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/value.mjs>
+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/>.
+*/
+
 import { curry } from './util.mjs';

-function unionWithObj(a, b, func) {
+export function unionWithObj(a, b, func) {
  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])])));
 }
@@ -0,0 +1,27 @@
+# @strudel.cycles/embed
+
+This package contains a embeddable web component for the Strudel REPL.
+
+## Usage
+
+Either install with `npm i @strudel.cycles/embed` or just use a cdn to import the script:
+
+```html
+<script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
+<strudel-repl>
+  <!--
+      "a4 [a3 c3] a3 c3".color('#F9D649')
+    .sub("<7 12 5 12>".slow(2))
+    .off(1/4,x=>x.add(7).color("#FFFFFF #0C3AA1 #C63928"))
+    .off(1/8,x=>x.add(12).color('#215CB6'))
+    .slow(2)
+    .legato(sine.range(0.3, 2).slow(28))
+    .wave("sawtooth square".fast(2))
+    .filter('lowpass', cosine.range(500,4000).slow(16))
+    .out()
+    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
+      -->
+</strudel-repl>
+```
+
+Note that the Code is placed inside HTML comments to prevent the browser from treating it as HTML.
@@ -0,0 +1,18 @@
+class Strudel extends HTMLElement {
+  constructor() {
+    super();
+  }
+  connectedCallback() {
+    setTimeout(() => {
+      const code = (this.innerHTML + '').replace('<!--', '').replace('-->', '').trim();
+      const iframe = document.createElement('iframe');
+      const src = `https://strudel.tidalcycles.org/#${encodeURIComponent(btoa(code))}`;
+      // const src = `http://localhost:3000/#${encodeURIComponent(btoa(code))}`;
+      iframe.setAttribute('src', src);
+      iframe.setAttribute('width', '600');
+      iframe.setAttribute('height', '400');
+      this.appendChild(iframe);
+    });
+  }
+}
+customElements.define('strudel-repl', Strudel);
@@ -0,0 +1,16 @@
+<script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
+<!-- <script src="./embed.js"></script> -->
+<strudel-repl>
+  <!--
+      "a4 [a3 c3] a3 c3".color('#F9D649')
+    .sub("<7 12 5 12>".slow(2))
+    .off(1/4,x=>x.add(7).color("#FFFFFF #0C3AA1 #C63928"))
+    .off(1/8,x=>x.add(12).color('#215CB6'))
+    .slow(2)
+    .legato(sine.range(0.3, 2).slow(28))
+    .wave("sawtooth square".fast(2))
+    .filter('lowpass', cosine.range(500,4000).slow(16))
+    .out()
+    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
+      -->
+</strudel-repl>
@@ -0,0 +1,24 @@
+{
+  "name": "@strudel.cycles/embed",
+  "version": "0.1.1",
+  "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
+  "main": "embed.js",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos <flix91@gmail.com>",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme"
+}
@@ -11,11 +11,15 @@ npm i @strudel.cycles/eval --save

 ## Example

+<!-- TODO: -extend +evalScope -->
+
 ```js
 import { evaluate, extend } from '@strudel.cycles/eval';
-import * as strudel from '@strudel.cycles/core';

-extend(strudel); // add strudel to eval scope
+evalScope(
+  import('@strudel.cycles/core'),
+  // import other strudel packages here
+); // add strudel to eval scope

 async function run(code) {
  const { pattern } = await evaluate(code);
@@ -1,17 +1,45 @@
+/*
+evaluate.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/evaluate.mjs>
+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/>.
+*/
+
 import shapeshifter from './shapeshifter.mjs';
 import * as strudel from '@strudel.cycles/core';

-const { isPattern } = strudel;
+const { isPattern, Pattern } = strudel;

 export const extend = (...args) => {
-  // TODO: find a way to make args available to eval without adding it to global scope...
-  // sadly, "with" does not work in strict mode
+  console.warn('@strudel.cycles/eval extend is deprecated, please use evalScope instead');
  Object.assign(globalThis, ...args);
 };

+let scoped = false;
+export const evalScope = async (...args) => {
+  if (scoped) {
+    console.warn('@strudel.cycles/eval evalScope was called more than once.');
+  }
+  scoped = true;
+  const results = await Promise.allSettled(args);
+  const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
+  results.forEach((result, i) => {
+    if (result.status === 'rejected') {
+      console.warn(`evalScope: module with index ${i} could not be loaded:`, result.reason);
+    }
+  });
+  Object.assign(globalThis, ...modules, Pattern.prototype.bootstrap());
+};
+
+function safeEval(str) {
+  return Function('"use strict";return (' + str + ')')();
+}
+
 export const evaluate = async (code) => {
+  if (!scoped) {
+    await evalScope(); // at least scope Pattern.prototype.boostrap
+  }
  const shapeshifted = shapeshifter(code); // transform syntactically correct js code to semantically usable code
-  let evaluated = await eval(shapeshifted);
+  let evaluated = await safeEval(shapeshifted);
  if (!isPattern(evaluated)) {
    console.log('evaluated', evaluated);
    const message = `got "${typeof evaluated}" instead of pattern`;
@@ -0,0 +1 @@
+export * from './evaluate.mjs';
@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/eval",
-	"version": "0.0.5",
+	"version": "0.1.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/eval",
-			"version": "0.0.3",
-			"license": "GPL-3.0-or-later",
+			"version": "0.1.1",
+			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"estraverse": "^5.3.0",
 				"shift-ast": "^6.1.0",
@@ -1,8 +1,9 @@
 {
  "name": "@strudel.cycles/eval",
-  "version": "0.0.5",
+  "version": "0.1.3",
  "description": "Code evaluator for strudel",
-  "main": "evaluate.mjs",
+  "main": "index.mjs",
+  "type": "module",
  "directories": {
    "test": "test"
  },
@@ -13,7 +14,6 @@
    "type": "git",
    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
-  "type": "module",
  "keywords": [
    "tidalcycles",
    "strudel",
@@ -22,13 +22,13 @@
    "algorave"
  ],
  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "GPL-3.0-or-later",
+  "license": "AGPL-3.0-or-later",
  "bugs": {
    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.0.5",
+    "@strudel.cycles/core": "^0.1.2",
    "estraverse": "^5.3.0",
    "shift-ast": "^6.1.0",
    "shift-codegen": "^7.0.3",
@@ -1,3 +1,9 @@
+/*
+shapeshifter.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/shapeshifter.mjs>
+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/>.
+*/
+
 /* import { parseScriptWithLocation } from './shift-parser/index.js'; // npm module does not work in the browser
 import traverser from './shift-traverser/index.js'; // npm module does not work in the browser */
 import { parseScriptWithLocation } from 'shift-parser';
@@ -23,6 +29,8 @@ const isNote = (name) => /^[a-gC-G][bs]?[0-9]$/.test(name);

 const addLocations = true;
 export const addMiniLocations = true;
+export const minifyStrings = true;
+export const wrappedAsync = true;

 export default (_code) => {
  const { code, addReturn } = wrapAsync(_code);
@@ -38,18 +46,18 @@ export default (_code) => {
      }

      // replace template string `xxx` with mini(`xxx`)
-      if (isBackTickString(node)) {
+      if (minifyStrings && isBackTickString(node)) {
        return minifyWithLocation(node, node, ast.locations, artificialNodes);
      }
      // allows to use top level strings, which are normally directives... but we don't need directives
-      if (node.directives?.length === 1 && !node.statements?.length) {
+      if (minifyStrings && node.directives?.length === 1 && !node.statements?.length) {
        const str = new LiteralStringExpression({ value: node.directives[0].rawValue });
        const wrapped = minifyWithLocation(str, node.directives[0], ast.locations, artificialNodes);
        return { ...node, directives: [], statements: [wrapped] };
      }

      // replace double quote string "xxx" with mini('xxx')
-      if (isStringWithDoubleQuotes(node, ast.locations, code)) {
+      if (minifyStrings && isStringWithDoubleQuotes(node, ast.locations, code)) {
        return minifyWithLocation(node, node, ast.locations, artificialNodes);
      }

@@ -117,7 +125,9 @@ export default (_code) => {
    },
  });
  // add return to last statement (because it's wrapped in an async function artificially)
-  addReturn(shifted);
+  if (wrappedAsync) {
+    addReturn(shifted);
+  }
  const generated = codegen(shifted);
  return generated;
 };
@@ -125,9 +135,11 @@ export default (_code) => {
 function wrapAsync(code) {
  // wrap code in async to make await work on top level => this will create 1 line offset to locations
  // this is why line offset is -1 in getLocationObject calls below
-  code = `(async () => {
+  if (wrappedAsync) {
+    code = `(async () => {
 ${code}
 })()`;
+  }
  const addReturn = (ast) => {
    const body = ast.statements[0].expression.callee.body; // actual code ast inside async function body
    body.statements = body.statements
@@ -204,9 +216,10 @@ function hasModifierCall(parent) {
    parent?.type === 'StaticMemberExpression' && Object.keys(Pattern.prototype.composable).includes(parent.property)
  );
 }
+const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);

 function isPatternFactory(node) {
-  return node?.type === 'CallExpression' && Object.keys(Pattern.prototype.factories).includes(node.callee.name);
+  return node?.type === 'CallExpression' && factories.includes(node.callee.name);
 }

 function canBeOverloaded(node) {
@@ -233,9 +246,14 @@ function reifyWithLocation(literalNode, node, locations, artificialNodes) {
 // with this, the reified pattern can pass its location to the event, to know where to highlight when it's active
 function minifyWithLocation(literalNode, node, locations, artificialNodes) {
  const args = getLocationArguments(node, locations);
+  const wrapped = wrapFunction('mini', literalNode);
+  if (!addMiniLocations) {
+    artificialNodes.push(wrapped);
+    return wrapped;
+  }
  const withLocation = new CallExpression({
    callee: new StaticMemberExpression({
-      object: wrapFunction('mini', literalNode),
+      object: wrapped,
      property: 'withMiniLocation',
    }),
    arguments: args,
@@ -246,17 +264,18 @@ function minifyWithLocation(literalNode, node, locations, artificialNodes) {

 function getLocationArguments(node, locations) {
  const loc = locations.get(node);
+  const lineOffset = wrappedAsync ? -1 : 0;
  return [
    new ArrayExpression({
      elements: [
-        new LiteralNumericExpression({ value: loc.start.line - 1 }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.start.line + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
        new LiteralNumericExpression({ value: loc.start.column }),
        new LiteralNumericExpression({ value: loc.start.offset }),
      ],
    }),
    new ArrayExpression({
      elements: [
-        new LiteralNumericExpression({ value: loc.end.line - 1 }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.end.line + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
        new LiteralNumericExpression({ value: loc.end.column }),
        new LiteralNumericExpression({ value: loc.end.offset }),
      ],
@@ -1,3 +1,9 @@
+/*
+index.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/shift-traverser/index.js>
+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/>.
+*/
+
 /*
  Copyright (C) 2014 Yusuke Suzuki <utatane.tea@gmail.com>

@@ -1,22 +1,29 @@
+/*
+evaluate.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/test/evaluate.test.mjs>
+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/>.
+*/
+
 import { strict as assert } from 'assert';
 import { evaluate, extend } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
 import * as strudel from '@strudel.cycles/core';

-const { cat } = strudel;
+const { fastcat } = strudel;

 extend({ mini }, strudel);
+// TODO: test evalScope

 describe('evaluate', () => {
  const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
  it('Should evaluate strudel functions', async () => {
    assert.deepStrictEqual(await ev("pure('c3')"), ['c3']);
    assert.deepStrictEqual(await ev('cat(c3)'), ['c3']);
-    assert.deepStrictEqual(await ev('cat(c3, d3)'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('fastcat(c3, d3)'), ['c3', 'd3']);
    assert.deepStrictEqual(await ev('slowcat(c3, d3)'), ['c3']);
  });
  it('Should be extendable', async () => {
-    extend({ myFunction: (...x) => cat(...x) });
+    extend({ myFunction: (...x) => fastcat(...x) });
    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
  });
  it('Should evaluate simple double quoted mini notation', async () => {
@@ -1,3 +1,9 @@
+/*
+shapeshifter.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/test/shapeshifter.test.mjs>
+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/>.
+*/
+
 import { strict as assert } from 'assert';
 import shapeshifter from '../shapeshifter.mjs';

@@ -0,0 +1,3 @@
+import './midi.mjs';
+
+export * from './midi.mjs';
@@ -1,3 +1,9 @@
+/*
+midi.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/midi/midi.mjs>
+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/>.
+*/
+
 import { isNote } from 'tone';
 import _WebMidi from 'webmidi';
 import { Pattern, isPattern } from '@strudel.cycles/core';
@@ -33,11 +39,11 @@ Pattern.prototype.midi = function (output, channel = 1) {
      }')`,
    );
  }
-  return this._withEvent((event) => {
-    // const onTrigger = (time: number, event: any) => {
-    const onTrigger = (time, event) => {
-      let note = event.value;
-      const velocity = event.context?.velocity ?? 0.9;
+  return this._withHap((hap) => {
+    // const onTrigger = (time: number, hap: any) => {
+    const onTrigger = (time, hap) => {
+      let note = hap.value;
+      const velocity = hap.context?.velocity ?? 0.9;
      if (!isNote(note)) {
        throw new Error('not a note: ' + note);
      }
@@ -69,10 +75,10 @@ Pattern.prototype.midi = function (output, channel = 1) {
      // await enableWebMidi()
      device.playNote(note, channel, {
        time,
-        duration: event.duration * 1000 - 5,
+        duration: hap.duration.valueOf() * 1000 - 5,
        velocity,
      });
    };
-    return event.setContext({ ...event.context, onTrigger });
+    return hap.setContext({ ...hap.context, onTrigger });
  });
 };
@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.0.6",
+	"version": "0.1.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/midi",
-			"version": "0.0.4",
-			"license": "GPL-3.0-or-later",
+			"version": "0.1.1",
+			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"tone": "^14.7.77",
 				"webmidi": "^2.5.2"
@@ -1,8 +1,8 @@
 {
  "name": "@strudel.cycles/midi",
-  "version": "0.0.6",
+  "version": "0.1.3",
  "description": "Midi API for strudel",
-  "main": "midi.mjs",
+  "main": "index.mjs",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/tidalcycles/strudel.git"
@@ -15,13 +15,13 @@
    "algorave"
  ],
  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "GPL-3.0-or-later",
+  "license": "AGPL-3.0-or-later",
  "bugs": {
    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/tone": "^0.0.6",
+    "@strudel.cycles/tone": "^0.1.3",
    "tone": "^14.7.77",
    "webmidi": "^2.5.2"
  }
@@ -0,0 +1,2 @@
+export * from './mini.mjs';
+export * from './krill-parser.js';
@@ -1,4 +1,4 @@
-// Generated by Peggy 1.2.0.
+// Generated by Peggy 2.0.1.
 //
 // https://peggyjs.org/

@@ -10,6 +10,7 @@ function peg$subclass(child, parent) {

 function peg$SyntaxError(message, expected, found, location) {
  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
  if (Object.setPrototypeOf) {
    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
  }
@@ -45,14 +46,15 @@ peg$SyntaxError.prototype.format = function(sources) {
    var loc = this.location.source + ":" + s.line + ":" + s.column;
    if (src) {
      var e = this.location.end;
-      var filler = peg$padEnd("", s.line.toString().length);
+      var filler = peg$padEnd("", s.line.toString().length, ' ');
      var line = src[s.line - 1];
      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
      str += "\n --> " + loc + "\n"
          + filler + " |\n"
          + s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1)
-          + peg$padEnd("", last - s.column, "^");
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
    } else {
      str += "\n at " + loc;
    }
@@ -73,7 +75,7 @@ peg$SyntaxError.buildMessage = function(expected, found) {
          : classEscape(part);
      });

-      return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
    },

    any: function() {
@@ -179,31 +181,32 @@ function peg$parse(input, options) {
  var peg$c7 = "#";
  var peg$c8 = "^";
  var peg$c9 = "_";
-  var peg$c10 = "[";
-  var peg$c11 = "]";
-  var peg$c12 = "<";
-  var peg$c13 = ">";
-  var peg$c14 = "@";
-  var peg$c15 = "!";
-  var peg$c16 = "(";
-  var peg$c17 = ")";
-  var peg$c18 = "/";
-  var peg$c19 = "*";
-  var peg$c20 = "%";
-  var peg$c21 = "struct";
-  var peg$c22 = "target";
-  var peg$c23 = "euclid";
-  var peg$c24 = "slow";
-  var peg$c25 = "rotL";
-  var peg$c26 = "rotR";
-  var peg$c27 = "fast";
-  var peg$c28 = "scale";
-  var peg$c29 = "//";
-  var peg$c30 = "cat";
-  var peg$c31 = "$";
-  var peg$c32 = "setcps";
-  var peg$c33 = "setbpm";
-  var peg$c34 = "hush";
+  var peg$c10 = ":";
+  var peg$c11 = "[";
+  var peg$c12 = "]";
+  var peg$c13 = "<";
+  var peg$c14 = ">";
+  var peg$c15 = "@";
+  var peg$c16 = "!";
+  var peg$c17 = "(";
+  var peg$c18 = ")";
+  var peg$c19 = "/";
+  var peg$c20 = "*";
+  var peg$c21 = "%";
+  var peg$c22 = "struct";
+  var peg$c23 = "target";
+  var peg$c24 = "euclid";
+  var peg$c25 = "slow";
+  var peg$c26 = "rotL";
+  var peg$c27 = "rotR";
+  var peg$c28 = "fast";
+  var peg$c29 = "scale";
+  var peg$c30 = "//";
+  var peg$c31 = "cat";
+  var peg$c32 = "$";
+  var peg$c33 = "setcps";
+  var peg$c34 = "setbpm";
+  var peg$c35 = "hush";

  var peg$r0 = /^[1-9]/;
  var peg$r1 = /^[eE]/;
@@ -229,32 +232,33 @@ function peg$parse(input, options) {
  var peg$e14 = peg$literalExpectation("#", false);
  var peg$e15 = peg$literalExpectation("^", false);
  var peg$e16 = peg$literalExpectation("_", false);
-  var peg$e17 = peg$literalExpectation("[", false);
-  var peg$e18 = peg$literalExpectation("]", false);
-  var peg$e19 = peg$literalExpectation("<", false);
-  var peg$e20 = peg$literalExpectation(">", false);
-  var peg$e21 = peg$literalExpectation("@", false);
-  var peg$e22 = peg$literalExpectation("!", false);
-  var peg$e23 = peg$literalExpectation("(", false);
-  var peg$e24 = peg$literalExpectation(")", false);
-  var peg$e25 = peg$literalExpectation("/", false);
-  var peg$e26 = peg$literalExpectation("*", false);
-  var peg$e27 = peg$literalExpectation("%", false);
-  var peg$e28 = peg$literalExpectation("struct", false);
-  var peg$e29 = peg$literalExpectation("target", false);
-  var peg$e30 = peg$literalExpectation("euclid", false);
-  var peg$e31 = peg$literalExpectation("slow", false);
-  var peg$e32 = peg$literalExpectation("rotL", false);
-  var peg$e33 = peg$literalExpectation("rotR", false);
-  var peg$e34 = peg$literalExpectation("fast", false);
-  var peg$e35 = peg$literalExpectation("scale", false);
-  var peg$e36 = peg$literalExpectation("//", false);
-  var peg$e37 = peg$classExpectation(["\n"], true, false);
-  var peg$e38 = peg$literalExpectation("cat", false);
-  var peg$e39 = peg$literalExpectation("$", false);
-  var peg$e40 = peg$literalExpectation("setcps", false);
-  var peg$e41 = peg$literalExpectation("setbpm", false);
-  var peg$e42 = peg$literalExpectation("hush", false);
+  var peg$e17 = peg$literalExpectation(":", false);
+  var peg$e18 = peg$literalExpectation("[", false);
+  var peg$e19 = peg$literalExpectation("]", false);
+  var peg$e20 = peg$literalExpectation("<", false);
+  var peg$e21 = peg$literalExpectation(">", false);
+  var peg$e22 = peg$literalExpectation("@", false);
+  var peg$e23 = peg$literalExpectation("!", false);
+  var peg$e24 = peg$literalExpectation("(", false);
+  var peg$e25 = peg$literalExpectation(")", false);
+  var peg$e26 = peg$literalExpectation("/", false);
+  var peg$e27 = peg$literalExpectation("*", false);
+  var peg$e28 = peg$literalExpectation("%", false);
+  var peg$e29 = peg$literalExpectation("struct", false);
+  var peg$e30 = peg$literalExpectation("target", false);
+  var peg$e31 = peg$literalExpectation("euclid", false);
+  var peg$e32 = peg$literalExpectation("slow", false);
+  var peg$e33 = peg$literalExpectation("rotL", false);
+  var peg$e34 = peg$literalExpectation("rotR", false);
+  var peg$e35 = peg$literalExpectation("fast", false);
+  var peg$e36 = peg$literalExpectation("scale", false);
+  var peg$e37 = peg$literalExpectation("//", false);
+  var peg$e38 = peg$classExpectation(["\n"], true, false);
+  var peg$e39 = peg$literalExpectation("cat", false);
+  var peg$e40 = peg$literalExpectation("$", false);
+  var peg$e41 = peg$literalExpectation("setcps", false);
+  var peg$e42 = peg$literalExpectation("setbpm", false);
+  var peg$e43 = peg$literalExpectation("hush", false);

  var peg$f0 = function() { return parseFloat(text()); };
  var peg$f1 = function(chars) { return chars.join("") };
@@ -288,7 +292,6 @@ function peg$parse(input, options) {
  var peg$f29 = function(v) { return new CommandStub("setcps", { value: v})};
  var peg$f30 = function(v) { return new CommandStub("setcps", { value: (v/120/2)})};
  var peg$f31 = function() { return new CommandStub("hush")};
-
  var peg$currPos = 0;
  var peg$savedPos = 0;
  var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -804,6 +807,15 @@ function peg$parse(input, options) {
                s0 = peg$FAILED;
                if (peg$silentFails === 0) { peg$fail(peg$e16); }
              }
+              if (s0 === peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 58) {
+                  s0 = peg$c10;
+                  peg$currPos++;
+                } else {
+                  s0 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e17); }
+                }
+              }
            }
          }
        }
@@ -846,11 +858,11 @@ function peg$parse(input, options) {
    s0 = peg$currPos;
    s1 = peg$parsews();
    if (input.charCodeAt(peg$currPos) === 91) {
-      s2 = peg$c10;
+      s2 = peg$c11;
      peg$currPos++;
    } else {
      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
    }
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
@@ -858,11 +870,11 @@ function peg$parse(input, options) {
      if (s4 !== peg$FAILED) {
        s5 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 93) {
-          s6 = peg$c11;
+          s6 = peg$c12;
          peg$currPos++;
        } else {
          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+          if (peg$silentFails === 0) { peg$fail(peg$e19); }
        }
        if (s6 !== peg$FAILED) {
          s7 = peg$parsews();
@@ -890,11 +902,11 @@ function peg$parse(input, options) {
    s0 = peg$currPos;
    s1 = peg$parsews();
    if (input.charCodeAt(peg$currPos) === 60) {
-      s2 = peg$c12;
+      s2 = peg$c13;
      peg$currPos++;
    } else {
      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
    }
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
@@ -902,11 +914,11 @@ function peg$parse(input, options) {
      if (s4 !== peg$FAILED) {
        s5 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 62) {
-          s6 = peg$c13;
+          s6 = peg$c14;
          peg$currPos++;
        } else {
          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e20); }
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
        }
        if (s6 !== peg$FAILED) {
          s7 = peg$parsews();
@@ -970,11 +982,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 64) {
-      s1 = peg$c14;
+      s1 = peg$c15;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -998,11 +1010,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 33) {
-      s1 = peg$c15;
+      s1 = peg$c16;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1026,11 +1038,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c16;
+      s1 = peg$c17;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1054,11 +1066,11 @@ function peg$parse(input, options) {
            }
            s12 = peg$parsews();
            if (input.charCodeAt(peg$currPos) === 41) {
-              s13 = peg$c17;
+              s13 = peg$c18;
              peg$currPos++;
            } else {
              s13 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e24); }
+              if (peg$silentFails === 0) { peg$fail(peg$e25); }
            }
            if (s13 !== peg$FAILED) {
              peg$savedPos = s0;
@@ -1092,11 +1104,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c18;
+      s1 = peg$c19;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1120,11 +1132,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 42) {
-      s1 = peg$c19;
+      s1 = peg$c20;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1148,11 +1160,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 37) {
-      s1 = peg$c20;
+      s1 = peg$c21;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1326,12 +1338,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c21) {
-      s1 = peg$c21;
+    if (input.substr(peg$currPos, 6) === peg$c22) {
+      s1 = peg$c22;
      peg$currPos += 6;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1355,12 +1367,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3, s4, s5;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c22) {
-      s1 = peg$c22;
+    if (input.substr(peg$currPos, 6) === peg$c23) {
+      s1 = peg$c23;
      peg$currPos += 6;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1396,12 +1408,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3, s4, s5, s6, s7;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c23) {
-      s1 = peg$c23;
+    if (input.substr(peg$currPos, 6) === peg$c24) {
+      s1 = peg$c24;
      peg$currPos += 6;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1437,12 +1449,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c24) {
-      s1 = peg$c24;
+    if (input.substr(peg$currPos, 4) === peg$c25) {
+      s1 = peg$c25;
      peg$currPos += 4;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1466,12 +1478,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c25) {
-      s1 = peg$c25;
+    if (input.substr(peg$currPos, 4) === peg$c26) {
+      s1 = peg$c26;
      peg$currPos += 4;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1495,12 +1507,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c26) {
-      s1 = peg$c26;
+    if (input.substr(peg$currPos, 4) === peg$c27) {
+      s1 = peg$c27;
      peg$currPos += 4;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1524,12 +1536,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c27) {
-      s1 = peg$c27;
+    if (input.substr(peg$currPos, 4) === peg$c28) {
+      s1 = peg$c28;
      peg$currPos += 4;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1553,12 +1565,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3, s4, s5;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c28) {
-      s1 = peg$c28;
+    if (input.substr(peg$currPos, 5) === peg$c29) {
+      s1 = peg$c29;
      peg$currPos += 5;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1603,12 +1615,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c29) {
-      s1 = peg$c29;
+    if (input.substr(peg$currPos, 2) === peg$c30) {
+      s1 = peg$c30;
      peg$currPos += 2;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
    }
    if (s1 !== peg$FAILED) {
      s2 = [];
@@ -1617,7 +1629,7 @@ function peg$parse(input, options) {
        peg$currPos++;
      } else {
        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e38); }
      }
      while (s3 !== peg$FAILED) {
        s2.push(s3);
@@ -1626,7 +1638,7 @@ function peg$parse(input, options) {
          peg$currPos++;
        } else {
          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e37); }
+          if (peg$silentFails === 0) { peg$fail(peg$e38); }
        }
      }
      s1 = [s1, s2];
@@ -1643,21 +1655,21 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c30) {
-      s1 = peg$c30;
+    if (input.substr(peg$currPos, 3) === peg$c31) {
+      s1 = peg$c31;
      peg$currPos += 3;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
      if (input.charCodeAt(peg$currPos) === 91) {
-        s3 = peg$c10;
+        s3 = peg$c11;
        peg$currPos++;
      } else {
        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        if (peg$silentFails === 0) { peg$fail(peg$e18); }
      }
      if (s3 !== peg$FAILED) {
        s4 = peg$parsews();
@@ -1699,11 +1711,11 @@ function peg$parse(input, options) {
          }
          s7 = peg$parsews();
          if (input.charCodeAt(peg$currPos) === 93) {
-            s8 = peg$c11;
+            s8 = peg$c12;
            peg$currPos++;
          } else {
            s8 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e18); }
+            if (peg$silentFails === 0) { peg$fail(peg$e19); }
          }
          if (s8 !== peg$FAILED) {
            peg$savedPos = s0;
@@ -1764,11 +1776,11 @@ function peg$parse(input, options) {
      if (s1 !== peg$FAILED) {
        s2 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 36) {
-          s3 = peg$c31;
+          s3 = peg$c32;
          peg$currPos++;
        } else {
          s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e39); }
+          if (peg$silentFails === 0) { peg$fail(peg$e40); }
        }
        if (s3 !== peg$FAILED) {
          s4 = peg$parsews();
@@ -1846,12 +1858,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c32) {
-      s1 = peg$c32;
+    if (input.substr(peg$currPos, 6) === peg$c33) {
+      s1 = peg$c33;
      peg$currPos += 6;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1875,12 +1887,12 @@ function peg$parse(input, options) {
    var s0, s1, s2, s3;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c33) {
-      s1 = peg$c33;
+    if (input.substr(peg$currPos, 6) === peg$c34) {
+      s1 = peg$c34;
      peg$currPos += 6;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1904,12 +1916,12 @@ function peg$parse(input, options) {
    var s0, s1;

    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c34) {
-      s1 = peg$c34;
+    if (input.substr(peg$currPos, 4) === peg$c35) {
+      s1 = peg$c35;
      peg$currPos += 4;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
    }
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
@@ -1932,35 +1944,34 @@ function peg$parse(input, options) {
  }


-    var PatternStub = function(source, alignment)
-    {
-      this.type_ = "pattern";
-      this.arguments_ = { alignment : alignment};
-      this.source_ = source;
-    }
+  var PatternStub = function(source, alignment)
+  {
+    this.type_ = "pattern";
+    this.arguments_ = { alignment : alignment};
+    this.source_ = source;
+  }

-    var OperatorStub = function(name, args, source)
-    {
-      this.type_ = name;
-      this.arguments_ = args;
-      this.source_ = source;
-    }
+  var OperatorStub = function(name, args, source)
+  {
+    this.type_ = name;
+    this.arguments_ = args;
+    this.source_ = source;
+  }

-    var ElementStub = function(source, options)
-    {
-      this.type_ = "element";
-      this.source_ = source;
-      this.options_ = options;
-      this.location_ = location();
-    }
-
-    var CommandStub = function(name, options)
-    {
-      this.type_ = "command";
-      this.name_ = name;
-      this.options_ = options;
-    }
+  var ElementStub = function(source, options)
+  {
+    this.type_ = "element";
+    this.source_ = source;
+    this.options_ = options;
+    this.location_ = location();
+  }

+  var CommandStub = function(name, options)
+  {
+    this.type_ = "command";
+    this.name_ = name;
+    this.options_ = options;
+  }


  peg$result = peg$startRuleFunction();
@@ -1984,5 +1995,6 @@ function peg$parse(input, options) {

 export {
  peg$SyntaxError as SyntaxError,
+
  peg$parse as parse
 };
@@ -1,3 +1,9 @@
+/*
+krill.pegjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/krill.pegjs>
+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/>.
+*/
+
 // Some terminology:
 // a sequence = a serie of elements placed between quotes
 // a stack = a serie of vertically aligned slices sharing the same overall length
@@ -81,7 +87,7 @@ quote = '"' / "'"
 // ------------------ steps and cycles ---------------------------

 // single step definition (e.g bd)
-step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_"
+step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_" / ":"
 step = ws chars:step_char+ ws { return chars.join("") }

 // define a sub cycle e.g. [1 2, 3 [4]]
@@ -1,3 +1,9 @@
+/*
+mini.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/mini.mjs>
+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/>.
+*/
+
 import * as krill from './krill-parser.js';
 import * as strudel from '@strudel.cycles/core';
 import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
@@ -1,11 +1,12 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.0.7",
+  "version": "0.1.3",
  "description": "Mini notation for strudel",
-  "main": "mini.mjs",
+  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "mocha --colors"
+    "test": "mocha --colors",
+    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs"
  },
  "repository": {
    "type": "git",
@@ -19,14 +20,17 @@
    "algorave"
  ],
  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "GPL-3.0-or-later",
+  "license": "AGPL-3.0-or-later",
  "bugs": {
    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.0.5",
-    "@strudel.cycles/eval": "^0.0.5",
-    "@strudel.cycles/tone": "^0.0.6"
+    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/eval": "^0.1.3",
+    "@strudel.cycles/tone": "^0.1.3"
+  },
+  "devDependencies": {
+    "peggy": "^2.0.1"
  }
 }
@@ -1,3 +1,9 @@
+/*
+mini.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/test/mini.test.mjs>
+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/>.
+*/
+
 import { strict as assert } from 'assert';
 import { mini } from '../mini.mjs';
 import '@strudel.cycles/core/euclid.mjs';
@@ -1,23 +1,43 @@
+/*
+osc.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/osc/osc.mjs>
+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/>.
+*/
+
 import OSC from 'osc-js';
 import { Pattern } from '@strudel.cycles/core';

 const comm = new OSC();
 comm.open();
 const latency = 0.1;
+let startedAt = -1;

+/**
+ *
+ * Sends each hap as an OSC message, which can be picked up by SuperCollider or any other OSC-enabled software.
+ *
+ * @name osc
+ * @memberof Pattern
+ * @returns Pattern
+ */
 Pattern.prototype.osc = function () {
-  return this._withEvent((event) => {
-    const onTrigger = (time, event, currentTime) => {
+  return this._withHap((hap) => {
+    const onTrigger = (time, hap, currentTime, cps) => {
+      const cycle = hap.wholeOrPart().begin.valueOf();
+      const delta = hap.duration.valueOf();
      // time should be audio time of onset
      // currentTime should be current time of audio context (slightly before time)
-      const keyvals = Object.entries(event.value).flat();
-      const offset = (time - currentTime + latency) * 1000;
-      const ts = Math.floor(Date.now() + offset);
+      if (startedAt < 0) {
+        startedAt = Date.now() - currentTime * 1000;
+      }
+      const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
+      const keyvals = Object.entries(controls).flat();
+      const ts = Math.floor(startedAt + (time + latency) * 1000);
      const message = new OSC.Message('/dirt/play', ...keyvals);
      const bundle = new OSC.Bundle([message], ts);
      bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
      comm.send(bundle);
    };
-    return event.setContext({ ...event.context, onTrigger });
+    return hap.setContext({ ...hap.context, onTrigger });
  });
 };
@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/osc",
-	"version": "0.0.2",
+	"version": "0.1.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/osc",
-			"version": "0.0.1",
-			"license": "GPL-3.0-or-later",
+			"version": "0.1.0",
+			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"osc-js": "^2.3.2"
 			}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/osc",
-  "version": "0.0.2",
+  "version": "0.1.1",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "scripts": {
@@ -21,7 +21,10 @@
    "algorave"
  ],
  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "GPL-3.0-or-later",
+  "contributors": [
+    "Alex McLean <alex@slab.org>"
+  ],
+  "license": "AGPL-3.0-or-later",
  "bugs": {
    "url": "https://github.com/tidalcycles/strudel/issues"
  },
@@ -1,3 +1,9 @@
+/*
+server.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/osc/server.js>
+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/>.
+*/
+
 const OSC = require('osc-js');

 const config = {
@@ -1,3 +1,9 @@
+/*
+tidal-sniffer.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/osc/tidal-sniffer.js>
+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/>.
+*/
+
 const OSC = require('osc-js');

 const config = {
@@ -0,0 +1,25 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist-ssr
+*.local
+
+!dist
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
@@ -0,0 +1,4 @@
+# @strudel.cycles/react
+
+This package contains react hooks and components for strudel.
+Example coming soon
@@ -0,0 +1,651 @@
+import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
+import { CodeMirror as CodeMirror$1 } from 'react-codemirror6';
+import { EditorView, Decoration } from '@codemirror/view';
+import { StateEffect, StateField } from '@codemirror/state';
+import { javascript } from '@codemirror/lang-javascript';
+import { HighlightStyle, tags } from '@codemirror/highlight';
+import { useInView } from 'react-hook-inview';
+import { evaluate } from '@strudel.cycles/eval';
+import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
+import { Tone } from '@strudel.cycles/tone';
+import { TimeSpan, State } from '@strudel.cycles/core';
+import { WebMidi, enableWebMidi } from '@strudel.cycles/midi';
+
+/*
+  Credits for color palette:
+
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+const ivory = '#abb2bf',
+  stone = '#7d8799', // Brightened compared to original to increase contrast
+  invalid = '#ffffff',
+  darkBackground = '#21252b',
+  highlightBackground = 'rgba(0, 0, 0, 0.5)',
+  // background = '#292d3e',
+  background = 'transparent',
+  tooltipBackground = '#353a42',
+  selection = 'rgba(128, 203, 196, 0.5)',
+  cursor = '#ffcc00';
+
+/// The editor theme styles for Material Palenight.
+const materialPalenightTheme = EditorView.theme(
+  {
+    // done
+    '&': {
+      color: '#ffffff',
+      backgroundColor: background,
+      fontSize: '15px',
+      'z-index': 11,
+    },
+
+    // done
+    '.cm-content': {
+      caretColor: cursor,
+      lineHeight: '22px',
+    },
+    '.cm-line': {
+      background: '#2C323699',
+    },
+    // done
+    '&.cm-focused .cm-cursor': {
+      backgroundColor: cursor,
+      width: '3px',
+    },
+
+    '&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
+      backgroundColor: selection,
+    },
+
+    '.cm-panels': { backgroundColor: darkBackground, color: '#ffffff' },
+    '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
+    '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
+
+    // done, use onedarktheme
+    '.cm-searchMatch': {
+      backgroundColor: '#72a1ff59',
+      outline: '1px solid #457dff',
+    },
+    '.cm-searchMatch.cm-searchMatch-selected': {
+      backgroundColor: '#6199ff2f',
+    },
+
+    '.cm-activeLine': { backgroundColor: highlightBackground },
+    '.cm-selectionMatch': { backgroundColor: '#aafe661a' },
+
+    '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
+      backgroundColor: '#bad0f847',
+      outline: '1px solid #515a6b',
+    },
+
+    // done
+    '.cm-gutters': {
+      background: 'transparent',
+      color: '#676e95',
+      border: 'none',
+    },
+
+    '.cm-activeLineGutter': {
+      backgroundColor: highlightBackground,
+    },
+
+    '.cm-foldPlaceholder': {
+      backgroundColor: 'transparent',
+      border: 'none',
+      color: '#ddd',
+    },
+
+    '.cm-tooltip': {
+      border: 'none',
+      backgroundColor: tooltipBackground,
+    },
+    '.cm-tooltip .cm-tooltip-arrow:before': {
+      borderTopColor: 'transparent',
+      borderBottomColor: 'transparent',
+    },
+    '.cm-tooltip .cm-tooltip-arrow:after': {
+      borderTopColor: tooltipBackground,
+      borderBottomColor: tooltipBackground,
+    },
+    '.cm-tooltip-autocomplete': {
+      '& > ul > li[aria-selected]': {
+        backgroundColor: highlightBackground,
+        color: ivory,
+      },
+    },
+  },
+  { dark: true },
+);
+
+/// The highlighting style for code in the Material Palenight theme.
+const materialPalenightHighlightStyle = HighlightStyle.define([
+  { tag: tags.keyword, color: '#c792ea' },
+  { tag: tags.operator, color: '#89ddff' },
+  { tag: tags.special(tags.variableName), color: '#eeffff' },
+  { tag: tags.typeName, color: '#f07178' },
+  { tag: tags.atom, color: '#f78c6c' },
+  { tag: tags.number, color: '#ff5370' },
+  { tag: tags.definition(tags.variableName), color: '#82aaff' },
+  { tag: tags.string, color: '#c3e88d' },
+  { tag: tags.special(tags.string), color: '#f07178' },
+  { tag: tags.comment, color: stone },
+  { tag: tags.variableName, color: '#f07178' },
+  { tag: tags.tagName, color: '#ff5370' },
+  { tag: tags.bracket, color: '#a2a1a4' },
+  { tag: tags.meta, color: '#ffcb6b' },
+  { tag: tags.attributeName, color: '#c792ea' },
+  { tag: tags.propertyName, color: '#c792ea' },
+  { tag: tags.className, color: '#decb6b' },
+  { tag: tags.invalid, color: invalid },
+]);
+
+/// Extension to enable the Material Palenight theme (both the editor theme and
+/// the highlight style).
+// : Extension
+const materialPalenight = [materialPalenightTheme, materialPalenightHighlightStyle];
+
+const setFlash = StateEffect.define();
+const flashField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(flash2, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setFlash)) {
+          if (e.value) {
+            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
+            flash2 = Decoration.set([mark.range(0, tr.newDoc.length)]);
+          } else {
+            flash2 = Decoration.set([]);
+          }
+        }
+      }
+      return flash2;
+    } catch (err) {
+      console.warn("flash error", err);
+      return flash2;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f)
+});
+const flash = (view) => {
+  view.dispatch({ effects: setFlash.of(true) });
+  setTimeout(() => {
+    view.dispatch({ effects: setFlash.of(false) });
+  }, 200);
+};
+const setHighlights = StateEffect.define();
+const highlightField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(highlights, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setHighlights)) {
+          highlights = Decoration.set(e.value.flatMap((hap) => (hap.context.locations || []).map(({ start, end }) => {
+            const color = hap.context.color || "#FFCA28";
+            let from = tr.newDoc.line(start.line).from + start.column;
+            let to = tr.newDoc.line(end.line).from + end.column;
+            const l = tr.newDoc.length;
+            if (from > l || to > l) {
+              return;
+            }
+            const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
+            return mark.range(from, to);
+          })).filter(Boolean), true);
+        }
+      }
+      return highlights;
+    } catch (err) {
+      return highlights;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f)
+});
+function CodeMirror({ value, onChange, onViewChanged, onCursor, options, editorDidMount }) {
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(CodeMirror$1, {
+    onViewChange: onViewChanged,
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      flex: "1 0 auto"
+    },
+    value,
+    onChange,
+    extensions: [
+      javascript(),
+      materialPalenight,
+      highlightField,
+      flashField
+    ]
+  }));
+}
+
+/*
+useCycle.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useCycle.mjs>
+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 declare interface UseCycleProps {
+  onEvent: ToneEventCallback<any>;
+  onQuery?: (state: State) => Hap[];
+  onSchedule?: (events: Hap[], cycle: number) => void;
+  onDraw?: ToneEventCallback<any>;
+  ready?: boolean; // if false, query will not be called on change props
+} */
+
+// function useCycle(props: UseCycleProps) {
+function useCycle(props) {
+  // onX must use useCallback!
+  const { onEvent, onQuery, onSchedule, ready = true, onDraw } = props;
+  const [started, setStarted] = useState(false);
+  const cycleDuration = 1;
+  const activeCycle = () => Math.floor(Tone.getTransport().seconds / cycleDuration);
+
+  // pull events with onQuery + count up to next cycle
+  const query = (cycle = activeCycle()) => {
+    const timespan = new TimeSpan(cycle, cycle + 1);
+    const events = onQuery?.(new State(timespan)) || [];
+    onSchedule?.(events, cycle);
+    // cancel events after current query. makes sure no old events are player for rescheduled cycles
+    // console.log('schedule', cycle);
+    // query next cycle in the middle of the current
+    const cancelFrom = timespan.begin.valueOf();
+    Tone.getTransport().cancel(cancelFrom);
+    // const queryNextTime = (cycle + 1) * cycleDuration - 0.1;
+    const queryNextTime = (cycle + 1) * cycleDuration - 0.5;
+
+    // if queryNextTime would be before current time, execute directly (+0.1 for safety that it won't miss)
+    const t = Math.max(Tone.getTransport().seconds, queryNextTime) + 0.1;
+    Tone.getTransport().schedule(() => {
+      query(cycle + 1);
+    }, t);
+
+    // schedule events for next cycle
+    events
+      ?.filter((event) => event.part.begin.equals(event.whole?.begin))
+      .forEach((event) => {
+        Tone.getTransport().schedule((time) => {
+          onEvent(time, event, Tone.getContext().currentTime);
+          Tone.Draw.schedule(() => {
+            // do drawing or DOM manipulation here
+            onDraw?.(time, event);
+          }, time);
+        }, event.part.begin.valueOf());
+      });
+  };
+
+  useEffect(() => {
+    ready && query();
+  }, [onEvent, onSchedule, onQuery, onDraw, ready]);
+
+  const start = async () => {
+    setStarted(true);
+    await Tone.start();
+    Tone.getTransport().start('+0.1');
+  };
+  const stop = () => {
+    Tone.getTransport().pause();
+    setStarted(false);
+  };
+  const toggle = () => (started ? stop() : start());
+  return {
+    start,
+    stop,
+    onEvent,
+    started,
+    setStarted,
+    toggle,
+    query,
+    activeCycle,
+  };
+}
+
+/*
+usePostMessage.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/usePostMessage.mjs>
+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/>.
+*/
+
+function usePostMessage(listener) {
+  useEffect(() => {
+    window.addEventListener('message', listener);
+    return () => window.removeEventListener('message', listener);
+  }, [listener]);
+  return useCallback((data) => window.postMessage(data, '*'), []);
+}
+
+/*
+useRepl.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useRepl.mjs>
+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/>.
+*/
+
+let s4 = () => {
+  return Math.floor((1 + Math.random()) * 0x10000)
+    .toString(16)
+    .substring(1);
+};
+const generateHash = (code) => encodeURIComponent(btoa(code));
+
+function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawProp }) {
+  const id = useMemo(() => s4(), []);
+  const [code, setCode] = useState(tune);
+  const [activeCode, setActiveCode] = useState();
+  const [log, setLog] = useState('');
+  const [error, setError] = useState();
+  const [pending, setPending] = useState(false);
+  const [hash, setHash] = useState('');
+  const [pattern, setPattern] = useState();
+  const dirty = useMemo(() => code !== activeCode || error, [code, activeCode, error]);
+  const pushLog = useCallback((message) => setLog((log) => log + `${log ? '\n\n' : ''}${message}`), []);
+
+  // below block allows disabling the highlighting by including "strudel disable-highlighting" in the code (as comment)
+  const onDraw = useMemo(() => {
+    if (activeCode && !activeCode.includes('strudel disable-highlighting')) {
+      return (time, event) => onDrawProp?.(time, event, activeCode);
+    }
+  }, [activeCode, onDrawProp]);
+
+  // cycle hook to control scheduling
+  const cycle = useCycle({
+    onDraw,
+    onEvent: useCallback(
+      (time, event, currentTime) => {
+        try {
+          onEvent?.(event);
+          if (event.context.logs?.length) {
+            event.context.logs.forEach(pushLog);
+          }
+          const { onTrigger, velocity } = event.context;
+          if (!onTrigger) {
+            if (defaultSynth) {
+              const note = getPlayableNoteValue(event);
+              defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
+            } else {
+              throw new Error('no defaultSynth passed to useRepl.');
+            }
+            /* console.warn('no instrument chosen', event);
+          throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */
+          } else {
+            onTrigger(time, event, currentTime, 1 /* cps */);
+          }
+        } catch (err) {
+          console.warn(err);
+          err.message = 'unplayable event: ' + err?.message;
+          pushLog(err.message); // not with setError, because then we would have to setError(undefined) on next playable event
+        }
+      },
+      [onEvent, pushLog, defaultSynth],
+    ),
+    onQuery: useCallback(
+      (state) => {
+        try {
+          return pattern?.query(state) || [];
+        } catch (err) {
+          console.warn(err);
+          err.message = 'query error: ' + err.message;
+          setError(err);
+          return [];
+        }
+      },
+      [pattern],
+    ),
+    onSchedule: useCallback((_events, cycle) => logCycle(_events, cycle), []),
+    ready: !!pattern && !!activeCode,
+  });
+
+  const broadcast = usePostMessage(({ data: { from, type } }) => {
+    if (type === 'start' && from !== id) {
+      // console.log('message', from, type);
+      cycle.setStarted(false);
+      setActiveCode(undefined);
+    }
+  });
+
+  const activateCode = useCallback(
+    async (_code = code) => {
+      if (activeCode && !dirty) {
+        setError(undefined);
+        cycle.start();
+        return;
+      }
+      try {
+        setPending(true);
+        const parsed = await evaluate(_code);
+        cycle.start();
+        broadcast({ type: 'start', from: id });
+        setPattern(() => parsed.pattern);
+        if (autolink) {
+          window.location.hash = '#' + encodeURIComponent(btoa(code));
+        }
+        setHash(generateHash(code));
+        setError(undefined);
+        setActiveCode(_code);
+        setPending(false);
+      } catch (err) {
+        err.message = 'evaluation error: ' + err.message;
+        console.warn(err);
+        setError(err);
+      }
+    },
+    [activeCode, dirty, code, cycle, autolink, id, broadcast],
+  );
+  // logs events of cycle
+  const logCycle = (_events, cycle) => {
+    if (_events.length) ;
+  };
+
+  const togglePlay = () => {
+    if (!cycle.started) {
+      activateCode();
+    } else {
+      cycle.stop();
+    }
+  };
+
+  return {
+    pending,
+    code,
+    setCode,
+    pattern,
+    error,
+    cycle,
+    setPattern,
+    dirty,
+    log,
+    togglePlay,
+    setActiveCode,
+    activateCode,
+    activeCode,
+    pushLog,
+    hash,
+  };
+}
+
+/*
+cx.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/cx.js>
+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/>.
+*/
+
+function cx(...classes) {
+  // : Array<string | undefined>
+  return classes.filter(Boolean).join(' ');
+}
+
+let highlights = []; // actively highlighted events
+let lastEnd;
+
+function useHighlighting({ view, pattern, active }) {
+  useEffect(() => {
+    if (view) {
+      if (pattern && active) {
+        let frame = requestAnimationFrame(updateHighlights);
+
+        function updateHighlights() {
+          try {
+            const audioTime = Tone.getTransport().seconds;
+            // force min framerate of 10 fps => fixes crash on tab refocus, where lastEnd could be far away
+            // see https://github.com/tidalcycles/strudel/issues/108
+            const begin = Math.max(lastEnd || audioTime, audioTime - 1 / 10);
+            const span = [begin, audioTime + 1 / 60];
+            lastEnd = audioTime + 1 / 60;
+            highlights = highlights.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
+            const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
+            highlights = highlights.concat(haps); // add potential new onsets
+            view.dispatch({ effects: setHighlights.of(highlights) }); // highlight all still active + new active haps
+          } catch (err) {
+            // console.log('error in updateHighlights', err);
+            view.dispatch({ effects: setHighlights.of([]) });
+          }
+          frame = requestAnimationFrame(updateHighlights);
+        }
+
+        return () => {
+          cancelAnimationFrame(frame);
+        };
+      } else {
+        highlights = [];
+        view.dispatch({ effects: setHighlights.of([]) });
+      }
+    }
+  }, [pattern, active, view]);
+}
+
+var tailwind = '';
+
+var style = '';
+
+const container = "_container_10e1g_1";
+const header = "_header_10e1g_5";
+const buttons = "_buttons_10e1g_9";
+const button = "_button_10e1g_9";
+const buttonDisabled = "_buttonDisabled_10e1g_17";
+const error = "_error_10e1g_21";
+const body = "_body_10e1g_25";
+var styles = {
+	container: container,
+	header: header,
+	buttons: buttons,
+	button: button,
+	buttonDisabled: buttonDisabled,
+	error: error,
+	body: body
+};
+
+function Icon({ type }) {
+  return /* @__PURE__ */ React.createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    className: "sc-h-5 sc-w-5",
+    viewBox: "0 0 20 20",
+    fill: "currentColor"
+  }, {
+    refresh: /* @__PURE__ */ React.createElement("path", {
+      fillRule: "evenodd",
+      d: "M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z",
+      clipRule: "evenodd"
+    }),
+    play: /* @__PURE__ */ React.createElement("path", {
+      fillRule: "evenodd",
+      d: "M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z",
+      clipRule: "evenodd"
+    }),
+    pause: /* @__PURE__ */ React.createElement("path", {
+      fillRule: "evenodd",
+      d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z",
+      clipRule: "evenodd"
+    })
+  }[type]);
+}
+
+function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
+  const { code, setCode, pattern, activateCode, error, cycle, dirty, togglePlay } = useRepl({
+    tune,
+    defaultSynth,
+    autolink: false
+  });
+  const [view, setView] = useState();
+  const [ref, isVisible] = useInView({
+    threshold: 0.01
+  });
+  const wasVisible = useRef();
+  const show = useMemo(() => {
+    if (isVisible || !hideOutsideView) {
+      wasVisible.current = true;
+    }
+    return isVisible || wasVisible.current;
+  }, [isVisible, hideOutsideView]);
+  useHighlighting({ view, pattern, active: cycle.started });
+  return /* @__PURE__ */ React.createElement("div", {
+    className: styles.container,
+    ref
+  }, /* @__PURE__ */ React.createElement("div", {
+    className: styles.header
+  }, /* @__PURE__ */ React.createElement("div", {
+    className: styles.buttons
+  }, /* @__PURE__ */ React.createElement("button", {
+    className: cx(styles.button, cycle.started ? "sc-animate-pulse" : ""),
+    onClick: () => togglePlay()
+  }, /* @__PURE__ */ React.createElement(Icon, {
+    type: cycle.started ? "pause" : "play"
+  })), /* @__PURE__ */ React.createElement("button", {
+    className: cx(dirty ? styles.button : styles.buttonDisabled),
+    onClick: () => activateCode()
+  }, /* @__PURE__ */ React.createElement(Icon, {
+    type: "refresh"
+  }))), error && /* @__PURE__ */ React.createElement("div", {
+    className: styles.error
+  }, error.message)), /* @__PURE__ */ React.createElement("div", {
+    className: styles.body
+  }, show && /* @__PURE__ */ React.createElement(CodeMirror, {
+    value: code,
+    onChange: setCode,
+    onViewChanged: setView
+  })));
+}
+
+/*
+useWebMidi.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useWebMidi.js>
+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/>.
+*/
+
+function useWebMidi(props) {
+  const { ready, connected, disconnected } = props;
+  const [loading, setLoading] = useState(true);
+  const [outputs, setOutputs] = useState(WebMidi?.outputs || []);
+  useEffect(() => {
+    enableWebMidi()
+      .then(() => {
+        // Reacting when a new device becomes available
+        WebMidi.addListener('connected', (e) => {
+          setOutputs([...WebMidi.outputs]);
+          connected?.(WebMidi, e);
+        });
+        // Reacting when a device becomes unavailable
+        WebMidi.addListener('disconnected', (e) => {
+          setOutputs([...WebMidi.outputs]);
+          disconnected?.(WebMidi, e);
+        });
+        ready?.(WebMidi);
+        setLoading(false);
+      })
+      .catch((err) => {
+        if (err) {
+          console.error(err);
+          //throw new Error("Web Midi could not be enabled...");
+          console.warn('Web Midi could not be enabled..');
+          return;
+        }
+      });
+  }, [ready, connected, disconnected, outputs]);
+  const outputByName = (name) => WebMidi.getOutputByName(name);
+  return { loading, outputs, outputByName };
+}
+
+export { CodeMirror, MiniRepl, cx, flash, useCycle, useHighlighting, usePostMessage, useRepl, useWebMidi };
@@ -0,0 +1 @@
+*,:before,:after{--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.sc-h-5{height:1.25rem}.sc-w-5{width:1.25rem}@keyframes sc-pulse{50%{opacity:.5}}.sc-animate-pulse{animation:sc-pulse 2s cubic-bezier(.4,0,.6,1) infinite}.cm-editor{background-color:transparent!important}._container_10e1g_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(68 76 87 / var(--tw-bg-opacity))}._header_10e1g_5{display:flex;justify-content:space-between;border-top-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity))}._buttons_10e1g_9{display:flex}._button_10e1g_9{display:flex;width:4rem;cursor:pointer;align-items:center;justify-content:center;border-right-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}._button_10e1g_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_10e1g_17{display:flex;width:4rem;cursor:pointer;cursor:not-allowed;align-items:center;justify-content:center;--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}._error_10e1g_21{padding:.25rem;text-align:right;font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(254 202 202 / var(--tw-text-opacity))}._body_10e1g_25{position:relative;overflow:auto}
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+<!--     <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" /> -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Strudel React Components</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
@@ -0,0 +1,62 @@
+{
+  "name": "@strudel.cycles/react",
+  "version": "0.1.4",
+  "description": "React components for strudel",
+  "main": "dist/index.cjs.js",
+  "module": "dist/index.es.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "import": "./dist/index.es.js"
+    },
+    "./dist/style.css": "./dist/style.css"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos <flix91@gmail.com>",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "dependencies": {
+    "@codemirror/lang-javascript": "^0.19.0",
+    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/eval": "^0.1.3",
+    "@strudel.cycles/tone": "^0.1.3",
+    "react-codemirror6": "^1.1.0",
+    "react-hook-inview": "^4.5.0"
+  },
+  "peerDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  },
+  "devDependencies": {
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
+    "@vitejs/plugin-react": "^1.3.0",
+    "autoprefixer": "^10.4.7",
+    "postcss": "^8.4.13",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "tailwindcss": "^3.0.24",
+    "vite": "^2.9.9"
+  }
+}
@@ -0,0 +1,12 @@
+/*
+postcss.config.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/postcss.config.js>
+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/>.
+*/
+
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}
@@ -0,0 +1,28 @@
+import React from 'react';
+import { MiniRepl } from './components/MiniRepl';
+import 'tailwindcss/tailwind.css';
+import { Tone, getDefaultSynth } from '@strudel.cycles/tone';
+import { evalScope } from '@strudel.cycles/eval';
+
+const defaultSynth = getDefaultSynth();
+
+evalScope(
+  Tone,
+  import('@strudel.cycles/core'),
+  import('@strudel.cycles/tone'),
+  import('@strudel.cycles/tonal'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/midi'),
+  import('@strudel.cycles/xen'),
+  import('@strudel.cycles/webaudio'),
+);
+
+function App() {
+  return (
+    <div>
+      <MiniRepl tune={`"c3"`} defaultSynth={defaultSynth} />
+    </div>
+  );
+}
+
+export default App;
@@ -0,0 +1,203 @@
+import React from 'react';
+import { CodeMirror as _CodeMirror } from 'react-codemirror6';
+// import { CodeMirrorLite as _CodeMirror } from 'react-codemirror6/dist/lite';
+import { EditorView, Decoration } from '@codemirror/view';
+import { StateField, StateEffect } from '@codemirror/state';
+import { javascript } from '@codemirror/lang-javascript';
+// import { materialPalenight } from 'codemirror6-themes';
+import { materialPalenight } from '../themes/material-palenight';
+
+export const setFlash = StateEffect.define();
+const flashField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(flash, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setFlash)) {
+          if (e.value) {
+            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
+            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
+          } else {
+            flash = Decoration.set([]);
+          }
+        }
+      }
+      return flash;
+    } catch (err) {
+      console.warn('flash error', err);
+      return flash;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+export const flash = (view) => {
+  view.dispatch({ effects: setFlash.of(true) });
+  setTimeout(() => {
+    view.dispatch({ effects: setFlash.of(false) });
+  }, 200);
+};
+
+export const setHighlights = StateEffect.define();
+const highlightField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(highlights, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setHighlights)) {
+          highlights = Decoration.set(
+            e.value
+              .flatMap((hap) =>
+                (hap.context.locations || []).map(({ start, end }) => {
+                  const color = hap.context.color || '#FFCA28';
+                  let from = tr.newDoc.line(start.line).from + start.column;
+                  let to = tr.newDoc.line(end.line).from + end.column;
+                  const l = tr.newDoc.length;
+                  if (from > l || to > l) {
+                    return; // dont mark outside of range, as it will throw an error
+                  }
+                  const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
+                  return mark.range(from, to);
+                }),
+              )
+              .filter(Boolean),
+            true,
+          );
+        }
+      }
+      return highlights;
+    } catch (err) {
+      // console.warn('highlighting error', err);
+      return highlights;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+export default function CodeMirror({ value, onChange, onViewChanged, onCursor, options, editorDidMount }) {
+  return (
+    <>
+      <_CodeMirror
+        onViewChange={onViewChanged}
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          flex: '1 0 auto',
+        }}
+        value={value}
+        onChange={onChange}
+        extensions={[
+          javascript(),
+          materialPalenight,
+          highlightField,
+          flashField,
+          // theme, language, ...
+        ]}
+      />
+    </>
+  );
+}
+
+let parenMark;
+export const markParens = (editor, data) => {
+  const v = editor.getDoc().getValue();
+  const marked = getCurrentParenArea(v, data);
+  parenMark?.clear();
+  parenMark = editor.getDoc().markText(...marked, { css: 'background-color: #00007720' }); //
+};
+
+// returns { line, ch } from absolute character offset
+export function offsetToPosition(offset, code) {
+  const lines = code.split('\n');
+  let line = 0;
+  let ch = 0;
+  for (let i = 0; i < offset; i++) {
+    if (ch === lines[line].length) {
+      line++;
+      ch = 0;
+    } else {
+      ch++;
+    }
+  }
+  return { line, ch };
+}
+
+// returns absolute character offset from { line, ch }
+export function positionToOffset(position, code) {
+  const lines = code.split('\n');
+  if (position.line > lines.length) {
+    // throw new Error('positionToOffset: position.line > lines.length');
+    return 0;
+  }
+  let offset = 0;
+  for (let i = 0; i < position.line; i++) {
+    offset += lines[i].length + 1;
+  }
+  offset += position.ch;
+  return offset;
+}
+
+// given code and caret position, the functions returns the indices of the parens we are in
+export function getCurrentParenArea(code, caretPosition) {
+  const caret = positionToOffset(caretPosition, code);
+  let open, i, begin, end;
+  // walk left
+  i = caret;
+  open = 0;
+  while (i > 0) {
+    if (code[i - 1] === '(') {
+      open--;
+    } else if (code[i - 1] === ')') {
+      open++;
+    }
+    if (open === -1) {
+      break;
+    }
+    i--;
+  }
+  begin = i;
+  // walk right
+  i = caret;
+  open = 0;
+  while (i < code.length) {
+    if (code[i] === '(') {
+      open--;
+    } else if (code[i] === ')') {
+      open++;
+    }
+    if (open === 1) {
+      break;
+    }
+    i++;
+  }
+  end = i;
+  return [begin, end].map((o) => offsetToPosition(o, code));
+}
+
+/* 
+export const markEvent = (editor) => (time, event) => {
+  const locs = event.context.locations;
+  if (!locs || !editor) {
+    return;
+  }
+  const col = event.context?.color || '#FFCA28';
+  // mark active event
+  const marks = locs.map(({ start, end }) =>
+    editor.getDoc().markText(
+      { line: start.line - 1, ch: start.column },
+      { line: end.line - 1, ch: end.column },
+      //{ css: 'background-color: #FFCA28; color: black' } // background-color is now used by parent marking
+      { css: 'outline: 1px solid ' + col + '; box-sizing:border-box' },
+      //{ css: `background-color: ${col};border-radius:5px` },
+    ),
+  );
+  //Tone.Transport.schedule(() => { // problem: this can be cleared by scheduler...
+  setTimeout(() => {
+    marks.forEach((mark) => mark.clear());
+    // }, '+' + event.duration * 0.5);
+  }, event.duration * 1000);
+}; */
@@ -0,0 +1,33 @@
+import React from 'react';
+
+export function Icon({ type }) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" className="sc-h-5 sc-w-5" viewBox="0 0 20 20" fill="currentColor">
+      {
+        {
+          refresh: (
+            <path
+              fillRule="evenodd"
+              d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z"
+              clipRule="evenodd"
+            />
+          ),
+          play: (
+            <path
+              fillRule="evenodd"
+              d="M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z"
+              clipRule="evenodd"
+            />
+          ),
+          pause: (
+            <path
+              fillRule="evenodd"
+              d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z"
+              clipRule="evenodd"
+            />
+          ),
+        }[type]
+      }
+    </svg>
+  );
+}
@@ -0,0 +1,48 @@
+import React, { useState, useMemo, useRef } from 'react';
+import { useInView } from 'react-hook-inview';
+import useRepl from '../hooks/useRepl.mjs';
+import cx from '../cx';
+import useHighlighting from '../hooks/useHighlighting.mjs';
+import CodeMirror6 from './CodeMirror6';
+import 'tailwindcss/tailwind.css';
+import './style.css';
+import styles from './MiniRepl.module.css';
+import { Icon } from './Icon';
+
+export function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
+  const { code, setCode, pattern, activateCode, error, cycle, dirty, togglePlay } = useRepl({
+    tune,
+    defaultSynth,
+    autolink: false,
+  });
+  const [view, setView] = useState();
+  const [ref, isVisible] = useInView({
+    threshold: 0.01,
+  });
+  const wasVisible = useRef();
+  const show = useMemo(() => {
+    if (isVisible || !hideOutsideView) {
+      wasVisible.current = true;
+    }
+    return isVisible || wasVisible.current;
+  }, [isVisible, hideOutsideView]);
+  useHighlighting({ view, pattern, active: cycle.started });
+  return (
+    <div className={styles.container} ref={ref}>
+      <div className={styles.header}>
+        <div className={styles.buttons}>
+          <button className={cx(styles.button, cycle.started ? 'sc-animate-pulse' : '')} onClick={() => togglePlay()}>
+            <Icon type={cycle.started ? 'pause' : 'play'} />
+          </button>
+          <button className={cx(dirty ? styles.button : styles.buttonDisabled)} onClick={() => activateCode()}>
+            <Icon type="refresh" />
+          </button>
+        </div>
+        {error && <div className={styles.error}>{error.message}</div>}
+      </div>
+      <div className={styles.body} >
+        {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} />}
+      </div>
+    </div>
+  );
+}
@@ -0,0 +1,27 @@
+.container {
+  @apply sc-rounded-md sc-overflow-hidden sc-bg-[#444C57];
+}
+
+.header {
+  @apply sc-flex sc-justify-between sc-bg-slate-700 sc-border-t sc-border-slate-500;
+}
+
+.buttons {
+  @apply sc-flex;
+}
+
+.button {
+  @apply sc-cursor-pointer sc-w-16 sc-flex sc-items-center sc-justify-center sc-p-1 sc-bg-slate-700 sc-border-r sc-border-slate-500  sc-text-white hover:sc-bg-slate-600;
+}
+
+.buttonDisabled {
+  @apply sc-cursor-pointer sc-w-16 sc-flex sc-items-center sc-justify-center sc-p-1 sc-bg-slate-600 sc-text-slate-400 sc-cursor-not-allowed;
+}
+
+.error {
+  @apply sc-text-right sc-p-1 sc-text-sm sc-text-red-200;
+}
+
+.body {
+  @apply sc-overflow-auto sc-relative;
+}
@@ -0,0 +1,3 @@
+.cm-editor {
+  background-color: transparent !important;
+}
@@ -0,0 +1,10 @@
+/*
+cx.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/cx.js>
+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 default function cx(...classes) {
+  // : Array<string | undefined>
+  return classes.filter(Boolean).join(' ');
+}
@@ -1,3 +1,9 @@
+/*
+useCycle.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useCycle.mjs>
+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/>.
+*/
+
 import { useEffect, useState } from 'react';
 import { Tone } from '@strudel.cycles/tone';
 import { State, TimeSpan } from '@strudel.cycles/core';
@@ -0,0 +1,44 @@
+import { useEffect } from 'react';
+import { setHighlights } from '../components/CodeMirror6';
+import { Tone } from '@strudel.cycles/tone';
+
+let highlights = []; // actively highlighted events
+let lastEnd;
+
+function useHighlighting({ view, pattern, active }) {
+  useEffect(() => {
+    if (view) {
+      if (pattern && active) {
+        let frame = requestAnimationFrame(updateHighlights);
+
+        function updateHighlights() {
+          try {
+            const audioTime = Tone.getTransport().seconds;
+            // force min framerate of 10 fps => fixes crash on tab refocus, where lastEnd could be far away
+            // see https://github.com/tidalcycles/strudel/issues/108
+            const begin = Math.max(lastEnd || audioTime, audioTime - 1 / 10);
+            const span = [begin, audioTime + 1 / 60];
+            lastEnd = audioTime + 1 / 60;
+            highlights = highlights.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
+            const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
+            highlights = highlights.concat(haps); // add potential new onsets
+            view.dispatch({ effects: setHighlights.of(highlights) }); // highlight all still active + new active haps
+          } catch (err) {
+            // console.log('error in updateHighlights', err);
+            view.dispatch({ effects: setHighlights.of([]) });
+          }
+          frame = requestAnimationFrame(updateHighlights);
+        }
+
+        return () => {
+          cancelAnimationFrame(frame);
+        };
+      } else {
+        highlights = [];
+        view.dispatch({ effects: setHighlights.of([]) });
+      }
+    }
+  }, [pattern, active, view]);
+}
+
+export default useHighlighting;
@@ -0,0 +1,17 @@
+/*
+usePostMessage.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/usePostMessage.mjs>
+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/>.
+*/
+
+import { useEffect, useCallback } from 'react';
+
+function usePostMessage(listener) {
+  useEffect(() => {
+    window.addEventListener('message', listener);
+    return () => window.removeEventListener('message', listener);
+  }, [listener]);
+  return useCallback((data) => window.postMessage(data, '*'), []);
+}
+
+export default usePostMessage;
@@ -1,3 +1,9 @@
+/*
+useRepl.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useRepl.mjs>
+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/>.
+*/
+
 import { useCallback, useState, useMemo } from 'react';
 import { evaluate } from '@strudel.cycles/eval';
 import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
@@ -11,7 +17,7 @@ let s4 = () => {
 };
 const generateHash = (code) => encodeURIComponent(btoa(code));

-function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw }) {
+function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawProp }) {
  const id = useMemo(() => s4(), []);
  const [code, setCode] = useState(tune);
  const [activeCode, setActiveCode] = useState();
@@ -24,12 +30,12 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw }) {
  const pushLog = useCallback((message) => setLog((log) => log + `${log ? '\n\n' : ''}${message}`), []);

  // below block allows disabling the highlighting by including "strudel disable-highlighting" in the code (as comment)
-  onDraw = useMemo(() => {
+  const onDraw = useMemo(() => {
    if (activeCode && !activeCode.includes('strudel disable-highlighting')) {
-      return onDraw;
+      return (time, event) => onDrawProp?.(time, event, activeCode);
    }
-  }, [activeCode, onDraw]);
-  
+  }, [activeCode, onDrawProp]);
+
  // cycle hook to control scheduling
  const cycle = useCycle({
    onDraw,
@@ -37,18 +43,21 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw }) {
      (time, event, currentTime) => {
        try {
          onEvent?.(event);
+          if (event.context.logs?.length) {
+            event.context.logs.forEach(pushLog);
+          }
          const { onTrigger, velocity } = event.context;
          if (!onTrigger) {
            if (defaultSynth) {
              const note = getPlayableNoteValue(event);
-              defaultSynth.triggerAttackRelease(note, event.duration, time, velocity);
+              defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
            } else {
              throw new Error('no defaultSynth passed to useRepl.');
            }
            /* console.warn('no instrument chosen', event);
          throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */
          } else {
-            onTrigger(time, event, currentTime);
+            onTrigger(time, event, currentTime, 1 /* cps */);
          }
        } catch (err) {
          console.warn(err);
@@ -137,6 +146,7 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw }) {
    dirty,
    log,
    togglePlay,
+    setActiveCode,
    activateCode,
    activeCode,
    pushLog,
@@ -1,3 +1,9 @@
+/*
+useWebMidi.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useWebMidi.js>
+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/>.
+*/
+
 import { useEffect, useState } from 'react';
 import { enableWebMidi, WebMidi } from '@strudel.cycles/midi'

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.f7b8088f.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
				`@@ -0,0 +1 @@`
				*,:before,:after{--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.sc-h-5{height:1.25rem}.sc-w-5{width:1.25rem}@keyframes sc-pulse{50%{opacity:.5}}.sc-animate-pulse{animation:sc-pulse 2s cubic-bezier(.4,0,.6,1) infinite}.cm-editor{background-color:transparent!important}._container_10e1g_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(68 76 87 / var(--tw-bg-opacity))}._header_10e1g_5{display:flex;justify-content:space-between;border-top-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity))}._buttons_10e1g_9{display:flex}._button_10e1g_9{display:flex;width:4rem;cursor:pointer;align-items:center;justify-content:center;border-right-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}._button_10e1g_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_10e1g_17{display:flex;width:4rem;cursor:pointer;cursor:not-allowed;align-items:center;justify-content:center;--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}._error_10e1g_21{padding:.25rem;text-align:right;font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(254 202 202 / var(--tw-text-opacity))}._body_10e1g_25{position:relative;overflow:auto}