support n / note in getPlayableNoteValue

.github/workflows/deploy.yml

@@ -1,46 +0,0 @@
-name: Build and Deploy
-
-on: [workflow_dispatch]
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-  deployments: write
-
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "npm"
-      - name: Install Dependencies
-        run: npm ci && cd repl && npm ci && cd ../tutorial && npm ci
-
-      - name: Build
-        run: npm run build
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          # Upload entire repository
-          path: "./out"
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [16, 17]
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -1,5 +1,4 @@
 dist
-out
 !docs/dist
 dist-*
 cabal-dev
@@ -28,13 +27,4 @@ node_modules/
 repl-parcel
 mytunes.ts
 doc
-out
-.parcel-cache
-repl_old
-tutorial.rendered.mdx
-doc.json
-talk/public/EmuSP12
-talk/public/samples
-server/samples/old
-repl/stats.html
-coverage
+.parcel-cache

.vscode/settings.json

@@ -2,8 +2,5 @@
     "cSpell.words": [
         "subspan",
         "vals"
-    ],
-    "yaml.schemas": {
-      "https://json.schemastore.org/github-workflow.json": "file:///home/felix/projects/strudel/.github/workflows/deploy.yml"
-    }
+    ]
 }

CONTRIBUTING.md

@@ -12,7 +12,7 @@ To get in touch with the contributors, either
 
 ## Ask a Question
 
-If you have any questions about strudel, make sure you've read the
+If you have any questions about strudel, make sure you've read the 
 [tutorial](https://strudel.tidalcycles.org/tutorial/) to find out if it answers your question.
 If not, use one of the Communication Channels above!
 
@@ -31,9 +31,8 @@ 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/tutorial/tutorial.mdx).
-
+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).
 This will even work without setting up a development environment, only a github account is required.
 
 ## Propose a Feature
@@ -51,11 +50,11 @@ Please check that it has not been reported before.
 To fix a bug that has been reported,
 
 1. check that nobody else is already fixing it and respond to the issue to let people know you're on it
-2. fork the repository
-3. make sure you've setup the project (see below)
-4. hopefully fix the bug
-5. make sure the tests pass
-6. send a pull request
+3. fork the repository
+4. make sure you've setup the project (see below)
+5. hopefully fix the bug
+6. make sure the tests pass
+7. send a pull request
 
 ## Write Tests
 
@@ -79,7 +78,7 @@ cd repl && npm i # install repl dependencies
 npm run start # start repl
 ```
 
-Those commands might look slightly different for your OS.
+Those commands might look slightly different for your OS. 
 Please report any problems you've had with the setup instructions!
 
 ## Code Style
@@ -96,7 +95,7 @@ If you use VSCode, you can
 
 The project is split into multiple [packages](https://github.com/tidalcycles/strudel/tree/main/packages) with independent versioning.
 When you run `npm i` on the root folder, [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces) will symlink all packages
-in the `node_modules` folder. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version,
+in the `node_modules` folder. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version, 
 which allows developing multiple packages at the same time
 
 ## Package Publishing
@@ -104,18 +103,9 @@ which allows developing multiple packages at the same time
 To publish all packages that have been changed since the last release, run:
 
 ```sh
-npm login
 npx lerna publish
 ```
 
-### New Packages
-
-To add a new package, you have to publish it manually the first time, using:
-
-```sh
-cd packages/<package-name> && npm publish --access public
-```
-
 ## Have Fun
 
 Remember to have fun, and that this project is driven by the passion of volunteers!

LICENSE

@@ -1,5 +1,5 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,15 +7,17 @@
 
                             Preamble
 
-  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 GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is 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.
+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.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -24,34 +26,44 @@ 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.
 
-  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.
+  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.
 
-  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.
+  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.
 
-  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.
+  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.
 
-  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.
+  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.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -60,7 +72,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +549,35 @@ 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. 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.
+  13. Use with the GNU Affero General Public License.
 
   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 General Public License into a single
+under version 3 of the GNU Affero 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+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.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-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
+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
 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 Affero General
+Program specifies that a certain numbered version of the GNU 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 Affero General Public License, you may choose any version ever published
+GNU 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 Affero General Public License can be used, that proxy's
+versions of the GNU 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.
 
@@ -633,29 +635,40 @@ 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 Affero General Public License as published by
+    it under the terms of the GNU 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.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU 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 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.
+  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".
 
   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 AGPL, see
+For more information on this, and how to apply and follow the GNU GPL, 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>.

README.md

@@ -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 software is slowly stabilising, but please continue to tread carefully.
+An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This is unstable software, please tread carefully.
 
 - Try it here: <https://strudel.tidalcycles.org/>
 - Tutorial: <https://strudel.tidalcycles.org/tutorial/>
@@ -27,10 +27,8 @@ 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.
 
@@ -38,12 +36,6 @@ Click on the package names to find out more about each one.
 
 There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).
 
-<a href="https://github.com/tidalcycles/strudel/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
-
 ## Community
 
 There is a #strudel channel on the TidalCycles discord: <https://discord.com/invite/HGEdXmRkzT>

docs/CNAME

@@ -0,0 +1 @@
+strudel.tidalcycles.org

docs/asset-manifest.json

@@ -0,0 +1,16 @@
+{
+  "files": {
+    "main.css": "/static/css/main.0d689283.css",
+    "main.js": "/static/js/main.7e790d7f.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.7e790d7f.js.map": "/static/js/main.7e790d7f.js.map",
+    "787.1c52cb78.chunk.js.map": "/static/js/787.1c52cb78.chunk.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.0d689283.css",
+    "static/js/main.7e790d7f.js"
+  ]
+}

docs/index.html

@@ -0,0 +1 @@
+<!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.7e790d7f.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>

docs/manifest.json

@@ -0,0 +1,15 @@
+{
+  "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"
+}

docs/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

docs/static/js/787.1c52cb78.chunk.js

@@ -0,0 +1,2 @@
+"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

docs/static/js/main.7e790d7f.js.LICENSE.txt

@@ -0,0 +1,56 @@
+/*
+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.
+ */

docs/tutorial/index.html

@@ -0,0 +1 @@
+<!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.a0cd6c24.js" defer></script> </body></html>

featurelist.md

@@ -0,0 +1,131 @@
+# 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

jsdoc.config.json

@@ -1,11 +0,0 @@
-{
-  "source": {
-    "includePattern": ".+\\.(js(doc|x)?|mjs)$",
-    "excludePattern": "node_modules|shift-parser|shift-reducer|shift-traverser"
-  },
-  "plugins": ["plugins/markdown"],
-  "opts": {
-    "destination": "./out/",
-    "recurse": true
-  }
-}

package.json

@@ -1,23 +1,16 @@
 {
   "name": "@strudel.cycles/monorepo",
-  "version": "0.0.4",
+  "version": "0.0.1",
   "private": true,
   "description": "Port of tidalcycles to javascript",
+  "main": "strudel.mjs",
   "scripts": {
-    "pretest": "cd tutorial && npm run jsdoc-json",
-    "test": "vitest run --version",
-    "test-ui": "vitest --ui",
-    "test-coverage": "vitest --coverage",
+    "test": "npm run test --workspaces --if-present",
     "bootstrap": "lerna bootstrap",
-    "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",
+    "setup": "npm i && npm run bootstrap && cd repl && npm i",
+    "repl": "cd repl && npm run start",
     "osc": "cd packages/osc && npm run server",
-    "build": "rm -rf out && cd repl && npm run build && cd ../tutorial && npm run build",
-    "preview": "npx serve ./out",
-    "deploy": "NODE_DEBUG=gh-pages 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"
+    "build": "cd repl && npm run build"
   },
   "workspaces": [
     "packages/*"
@@ -34,21 +27,14 @@
     "algorave"
   ],
   "author": "Alex McLean <alex@slab.org> (https://slab.org)",
-  "license": "AGPL-3.0-or-later",
+  "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
   "homepage": "https://strudel.tidalcycles.org",
   "devDependencies": {
-    "@vitest/ui": "^0.21.1",
-    "c8": "^7.12.0",
     "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",
-    "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.21.1"
+    "mocha": "^9.1.4"
   }
 }

packages/README.md

@@ -1,15 +0,0 @@
-# Packages
-
-Each folder represents one of the @strudel.cycles/* packages [published to npm](https://www.npmjs.com/org/strudel.cycles).
-
-To understand how those pieces connect, refer to the [Technical Manual](https://github.com/tidalcycles/strudel/wiki/Technical-Manual) or the individual READMEs.
-
-This is a graphical view of all the packages: [full screen](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-![dependencies](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-Generated with
-
-```sh
-npx depcruise --include-only "^packages" -X "node_modules" --output-type dot packages | dot -T svg > dependencygraph.svg
-```

packages/core/.npmignore

@@ -1 +0,0 @@
-examples

packages/core/controls.mjs

@@ -1,450 +1,101 @@
-/*
-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 style={{display:'none'}}>
-   * <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")
-   *
-   */
   ['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()
-   */
-  // 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.'],
-  /**
-   * Controls the gain by an exponential amount.
-   *
-   * @name gain
-   * @param {number | Pattern} amount gain.
-   * @example
-   * s("hh*8").gain(".4!2 1 .4!2 1 .4 1")
-   *
-   */
-  [
-    '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@.',
-  ],
-  /**
-   * 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',
     'attack',
     'a pattern of numbers to specify the attack time (in seconds) of an envelope applied to each sample.',
   ],
-
-  /**
-   * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
-   *
-   * @name bank
-   * @param {string | Pattern} bank the name of the bank
-   * @example
-   * s("bd sd").bank('RolandTR909') // = s("RolandTR909_bd RolandTR909_sd")
-   *
-   */
-  ['f', 'bank', 'selects sound bank to use'],
-
-  // 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', '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',
-    'release',
-    'a pattern of numbers to specify the release time (in seconds) of an envelope applied to each sample.',
+    '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', ''],
+  [
+    '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', ''],
+  [
+    'f',
+    'hcutoff',
+    'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the high-pass filter. Also has alias @hpf@',
   ],
   [
     '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,hh*3").bandf("<1000 2000 4000 8000>")
-   *
-   */
-  ['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(500).bandq("<0 1 2 3>")
-   *
-   */
-  ['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.
-   *
-   * @memberof Pattern
-   * @name begin
-   * @param {number | Pattern} amount between 0 and 1, where 1 is the length of the sample
-   * @example
-   * samples({ rave: 'rave/AREUREADY.wav' }, 'github:tidalcycles/Dirt-Samples/master/')
-   * s("rave").begin("<0 .25 .5 .75>")
-   *
-   */
-  [
-    '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 .begin, but cuts off the end off each sample.
-   *
-   * @memberof Pattern
-   * @name end
-   * @param {number | Pattern} length 1 = whole sample, .5 = half sample, .25 = quarter sample etc..
-   * @example
-   * s("bd*2,oh*4").end("<.1 .2 .5 1>")
-   *
-   */
-  [
-    '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").fast(2).crush("<16 8 7 6 5 4 3 2>")
-   *
-   */
-  [
-    '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. Caution: This effect seems to only work in chromium based browsers
-   *
-   * @name coarse
-   * @param {number | Pattern} factor 1 for original 2 for half, 3 for a third and so on.
-   * @example
-   * s("bd sd,hh*4").coarse("<1 4 8 16 32>")
-   *
-   */
-  [
-    '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 sd,hh*3").cutoff("<4000 2000 1000 500 200 100>")
-   *
-   */
-  // 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 sd,hh*4").hcutoff("<4000 2000 1000 500 200 100>")
-   *
-   */
-  // 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 resonance of the high-pass filter.
-   *
-   * @name hresonance
-   * @param {number | Pattern} q resonance factor between 0 and 50
-   * @example
-   * s("bd sd,hh*4").hcutoff(2000).hresonance("<0 10 20 30>")
-   *
-   */
   [
     '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 50
-   * @example
-   * s("bd sd,hh*4").cutoff(2000).resonance("<0 10 20 30>")
-   *
-   */
-  ['f', 'resonance', 'a pattern of numbers from 0 to 1. Specifies the resonance of the low-pass filter.'],
-  // TODO: add lpq synonym?
-  /**
-   * DJ filter, below 0.5 is low pass filter, above is high pass filter.
-   *
-   * @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("oh*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', ''],
@@ -456,86 +107,47 @@ 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', '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', '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',
     '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', ''], // TODO: what is this? not found in tidal doc
+  ['f', 'offset', ''],
   // ['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', ''], // 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>")
-   *
-   */
+  ['f', 'overgain', ''],
+  ['f', 'overshape', ''],
   [
     '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',
@@ -555,168 +167,68 @@ 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'"],
-  // TODO: slide param for certain synths
-  ['f', 'slide', ''],
-  // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
-  ['f', 'semitone', ''],
-  // 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',
+    '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.'],
-  /**
-   * 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',
-    'roomsize',
-    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
-  ],
   // ['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,hh*4").shape("<0 .2 .4 .6 .8>")
-   *
-   */
+  ['f', 'semitone', ''],
   [
     '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',
+    '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',
     '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!',
   ],
-  /**
-   * 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()
-   *
-   */
+  ['f', 'squiz', ''],
+  ['f', 'stutterdepth', ''],
+  ['f', 'stuttertime', ''],
+  ['f', 'sustain', ''],
+  ['f', 'timescale', ''],
+  ['f', 'timescalewin', ''],
+  // ['f', 'tomdecay', ''],
   [
     '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`.',
   ],
-  /**
-   * 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', 'velocity', ''],
   // ['f', 'vcfegint', ''],
   // ['f', 'vcoegint', ''],
-  // TODO: Use a rest (~) to override the effect <- vowel
-  /**
-   *
-   * Formant filter to make things sound like vowels.
-   *
-   * @name vowel
-   * @param {string | Pattern} vowel You can use a e i o u.
-   * @example
-   * note("c2 <eb2 <g2 g1>>").s('sawtooth')
-   * .vowel("<a e i <o u>>")
-   *
-   */
+  ['f', 'voice', ''],
   [
     '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', ''],
@@ -759,34 +271,18 @@ 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 _setter = (func, name) =>
+const _setter = (func) =>
   function (...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] = _setter(controls[name], name);
+  Pattern.prototype[name] = _setter(controls[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;

packages/core/cyclist.mjs

@@ -1,81 +0,0 @@
-/*
-cyclist.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/cyclist.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 createClock from './zyklus.mjs';
-
-export class Cyclist {
-  worker;
-  pattern;
-  started = false;
-  cps = 1; // TODO
-  getTime;
-  phase = 0;
-  constructor({ interval, onTrigger, onError, getTime, latency = 0.1 }) {
-    this.getTime = getTime;
-    const round = (x) => Math.round(x * 1000) / 1000;
-    this.clock = createClock(
-      getTime,
-      (phase, duration, tick) => {
-        if (tick === 0) {
-          this.origin = phase;
-        }
-        const begin = round(phase - this.origin);
-        this.phase = begin - latency;
-        const end = round(begin + duration);
-        const time = getTime();
-        try {
-          const haps = this.pattern.queryArc(begin, end); // get Haps
-          // console.log('haps', haps.map((hap) => hap.value.n).join(' '));
-          haps.forEach((hap) => {
-            // console.log('hap', hap.value.n, hap.part.begin);
-            if (hap.part.begin.equals(hap.whole.begin)) {
-              const deadline = hap.whole.begin + this.origin - time + latency;
-              const duration = hap.duration * 1;
-              onTrigger?.(hap, deadline, duration);
-            }
-          });
-        } catch (e) {
-          console.warn('scheduler error', e);
-          onError?.(e);
-        }
-      }, // called slightly before each cycle
-      interval, // duration of each cycle
-    );
-  }
-  getPhase() {
-    return this.phase;
-  }
-  start() {
-    if (!this.pattern) {
-      throw new Error('Scheduler: no pattern set! call .setPattern first.');
-    }
-    this.clock.start();
-    this.started = true;
-  }
-  pause() {
-    this.clock.stop();
-    delete this.origin;
-    this.started = false;
-  }
-  stop() {
-    delete this.origin;
-    this.clock.stop();
-    this.started = false;
-  }
-  setPattern(pat, autostart = false) {
-    this.pattern = pat;
-    if (autostart && !this.started) {
-      this.start();
-    }
-  }
-  setCps(cps = 1) {
-    this.cps = cps;
-  }
-  log(begin, end, haps) {
-    const onsets = haps.filter((h) => h.hasOnset());
-    console.log(`${begin.toFixed(4)} - ${end.toFixed(4)} ${Array(onsets.length).fill('I').join('')}`);
-  }
-}

packages/core/drawLine.mjs

@@ -1,62 +0,0 @@
-/*
-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);
- * silence;
- */
-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;

packages/core/euclid.mjs

@@ -1,9 +1,3 @@
-/*
-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';
@@ -17,79 +11,10 @@ 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
- * @name euclid
- * @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.
- * note("c3").euclid(3,8)
- */
-
-/**
- * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
- * note("c3").euclid(2,5)
- * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
- * note("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.
- * note("c3").euclid(3,5,2)
- * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
- * note("c3").euclid(3,7)
- * @example // The Cuban tresillo pattern.
- * note("c3").euclid(3,8)
- * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
- * note("c3").euclid(4,7)
- * @example // The Aksak rhythm of Turkey.
- * note("c3").euclid(4,9)
- * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
- * note("c3").euclid(4,11)
- * @example // Yields the York-Samai pattern, a popular Arab rhythm.
- * note("c3").euclid(5,6)
- * @example // The Nawakhat pattern, another popular Arab rhythm.
- * note("c3").euclid(5,7)
- * @example // The Cuban cinquillo pattern.
- * note("c3").euclid(5,8)
- * @example // A popular Arab rhythm called Agsag-Samai.
- * note("c3").euclid(5,9)
- * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
- * note("c3").euclid(5,11)
- * @example // The Venda clapping pattern of a South African children’s song.
- * note("c3").euclid(5,12)
- * @example // The Bossa-Nova rhythm necklace of Brazil.
- * note("c3").euclid(5,16)
- * @example // A typical rhythm played on the Bendir (frame drum).
- * note("c3").euclid(7,8)
- * @example // A common West African bell pattern.
- * note("c3").euclid(7,12)
- * @example // A Samba rhythm necklace from Brazil.
- * note("c3").euclid(7,16,14)
- * @example // A rhythm necklace used in the Central African Republic.
- * note("c3").euclid(9,16)
- * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
- * note("c3").euclid(11,24,14)
- * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
- * note("c3").euclid(13,24,5)
- */
 Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
   return this.struct(euclid(pulses, steps, rotation));
 };
 
-/**
- * Similar to `.euclid`, but each pulse is held until the next pulse, so there will be no gaps.
- * @name euclidLegato
- * @memberof Pattern
- * @example
- * n("g2").decay(.1).sustain(.3).euclidLegato(3,8)
- */
 Pattern.prototype.euclidLegato = function (pulses, steps, rotation = 0) {
   const bin_pat = euclid(pulses, steps, rotation);
   const firstOne = bin_pat.indexOf(1);

packages/core/evaluate.mjs

@@ -1,45 +0,0 @@
-/*
-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 * as strudel from '@strudel.cycles/core';
-
-const { isPattern, Pattern } = strudel;
-
-let scoped = false;
-export const evalScope = async (...args) => {
-  if (scoped) {
-    console.warn('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, transpiler) => {
-  if (!scoped) {
-    await evalScope(); // at least scope Pattern.prototype.boostrap
-  }
-  if (transpiler) {
-    code = transpiler(code); // transform syntactically correct js code to semantically usable code
-  }
-  let evaluated = await safeEval(code);
-  if (!isPattern(evaluated)) {
-    console.log('evaluated', evaluated);
-    const message = `got "${typeof evaluated}" instead of pattern`;
-    throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
-  }
-  return { mode: 'javascript', pattern: evaluated };
-};

packages/core/examples/canvas.html

@@ -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.valueOf() * canvas.width, canvas.height);
+        ctx.fillRect(event.whole.begin * canvas.width, 0, event.duration * canvas.width, canvas.height);
       });
     }
   </script>

packages/core/examples/repl.html

@@ -1,90 +0,0 @@
-<div style="position: absolute; bottom: 0; right: 0; padding: 4px; width: 100vw; display: flex">
-  <button id="start" style="font-size: 2em">start</button>
-  <button id="stop" style="font-size: 2em">stop</button>
-  <button id="slower" style="font-size: 2em">slower</button>
-  <button id="faster" style="font-size: 2em">faster</button>
-</div>
-<textarea
-  style="font-size: 2em; background: #052b49; color: #fff; height: 100%; width: 100%; outline: none; border: 0"
-  id="text"
-  spellcheck="false"
->
-Loading...</textarea
->
-<script type="module">
-  document.body.style = 'margin: 0';
-  import * as strudel from '@strudel.cycles/core';
-
-  const { cat, State, TimeSpan, Scheduler, getPlayableNoteValue, getFreq } = strudel;
-  Object.assign(window, strudel); // add strudel to eval scope
-
-  const ctx = new AudioContext();
-  const scheduler = new Scheduler({
-    // audioContext: getAudioContext(),
-    interval: 0.1,
-    onTrigger: (hap, time, duration) => {
-      const freq = getFrequency(hap);
-      const osc = ctx.createOscillator();
-      const gain = 0.2;
-      osc.frequency.value = freq;
-      osc.type = 'triangle';
-      const onset = ctx.currentTime + time;
-      const offset = onset + duration;
-      const attack = 0.05;
-      const release = 0.05;
-      osc.start(onset);
-      osc.stop(offset + release);
-
-      const g = ctx.createGain();
-      g.gain.setValueAtTime(gain, onset);
-      g.gain.linearRampToValueAtTime(gain, onset + attack);
-      g.gain.setValueAtTime(gain, offset - release);
-      g.gain.linearRampToValueAtTime(0, offset);
-      osc.connect(g);
-      g.connect(ctx.destination);
-    },
-  });
-
-  let initialCode = `stack('c4','e4',cat('g4','a4','b4','a4'))
-.add(cat(0,1,2,3,4,3,2,1).slow(8))
-.fast(2)
-.cps(tri.range(1,8).slow(32))`;
-
-  try {
-    const base64 = decodeURIComponent(window.location.href.split('#')[1]);
-    initialCode = atob(base64);
-  } catch (err) {
-    console.warn('failed to decode', err);
-  }
-  const input = document.getElementById('text');
-  input.value = initialCode;
-  const evaluate = () => {
-    try {
-      const pattern = eval(input.value);
-      scheduler.setPattern(pattern);
-      window.location.hash = '#' + encodeURIComponent(btoa(input.value)); // update url hash
-    } catch (err) {
-      console.warn(err);
-    }
-  };
-  evaluate();
-  input.addEventListener('input', () => evaluate());
-  document.getElementById('start').addEventListener('click', async () => {
-    await ctx.resume();
-    scheduler.start();
-  });
-  document.getElementById('stop').addEventListener('click', () => scheduler.stop());
-  document.getElementById('slower').addEventListener('click', () => scheduler.setCps(scheduler.cps - 0.1));
-  document.getElementById('faster').addEventListener('click', () => scheduler.setCps(scheduler.cps + 0.1));
-</script>
-<!--
-  sequence(1,2).mul(55/2) // frequencies
-  .mul(slowcat(1,2))
-  .mul(slowcat(1,3/2,4/3,5/3).slow(8))
-  .fast(3)
-  .freq()
-  .velocity(.5)
-  .s('sawtooth')
-  .cutoff(800)
-  .out()
--->

packages/core/examples/scheduled.html

@@ -1,44 +0,0 @@
-<input
-  type="text"
-  id="text"
-  value="seq('c3','eb3','g3').note().s('sawtooth').out()"
-  style="width: 100%; font-size: 2em; outline: none; margin-bottom: 10px"
-  spellcheck="false"
-/>
-<button id="start">play</button>
-<div id="output"></div>
-<script type="module">
-  const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@latest');
-
-  const controls = await import('https://cdn.skypack.dev/@strudel.cycles/core@latest/controls.mjs');
-  const { getAudioContext, Scheduler } = await import('https://cdn.skypack.dev/@strudel.cycles/webaudio@latest');
-  let scheduler;
-
-  const audioContext = getAudioContext();
-  const latency = 0.2;
-
-  Object.assign(window, strudel);
-  Object.assign(window, controls.default);
-  scheduler = new Scheduler({
-    audioContext,
-    interval: 0.1,
-    latency,
-    onEvent: (hap) => {
-      if (!hap.context.onTrigger) {
-        console.warn('no output chosen. use one of .out() .webdirt() .osc()');
-      }
-    },
-  });
-  let started;
-  document.getElementById('start').addEventListener('click', async () => {
-    const code = document.getElementById('text').value;
-    const pattern = eval(code);
-    const events = pattern._firstCycleValues;
-    console.log(code, '->', events);
-    scheduler.setPattern(pattern);
-    if (!started) {
-      scheduler.start();
-      started = true;
-    }
-  });
-</script>

packages/core/examples/vite-vanilla-repl/.gitignore

@@ -1 +0,0 @@
-!dist

packages/core/examples/vite-vanilla-repl/README.md

@@ -1,10 +0,0 @@
-# vite-vanilla-repl
-
-This folder demonstrates how to set up a strudel repl using vite and vanilla JS. Run it using:
-
-```sh
-npm i
-npm run dev
-```
-
-or view it [live on githack](https://rawcdn.githack.com/tidalcycles/strudel/5fb36acb046ead7cd6ad3cd10f532e7f585f536a/packages/core/examples/vite-vanilla-repl/dist/index.html)

packages/core/examples/vite-vanilla-repl/dist/assets/index.b66fb637.js

@@ -1 +0,0 @@
-import{g as s,b as d,e as t,j as u,l as o,f as r,p as f,i as p,d as g,h as i,w as l,a as m}from"./index.f88145a1.js";export{s as getAudioContext,d as getCachedBuffer,t as getLoadedBuffer,u as getLoadedSamples,o as loadBuffer,r as loadGithubSamples,f as panic,p as resetLoadedSamples,g as reverseBuffer,i as samples,l as webaudioOutput,m as webaudioOutputTrigger};

packages/core/examples/vite-vanilla-repl/dist/index.html

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite Vanilla Strudel REPL</title>
-    <script type="module" crossorigin src="/tidalcycles/strudel/general-purpose-scheduler/packages/core/examples/vite-vanilla-repl/dist/assets/index.f88145a1.js"></script>
-  </head>
-  <body style="margin: 0; background: #222">
-    <div style="display: grid; height: 100vh">
-      <textarea
-        id="text"
-        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
-        spellcheck="false"
-      ></textarea>
-    </div>
-    <button
-      id="start"
-      style="
-        position: absolute;
-        border-radius: 10px;
-        top: 20px;
-        right: 20px;
-        padding: 20px;
-        border: 2px solid white;
-        background: transparent;
-        color: white;
-        cursor: pointer;
-      "
-    >
-      evaluate
-    </button>
-    <div id="output"></div>
-    
-  </body>
-</html>

packages/core/examples/vite-vanilla-repl/index.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite Vanilla Strudel REPL</title>
-  </head>
-  <body style="margin: 0; background: #222">
-    <div style="display: grid; height: 100vh">
-      <textarea
-        id="text"
-        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
-        spellcheck="false"
-      ></textarea>
-    </div>
-    <button
-      id="start"
-      style="
-        position: absolute;
-        border-radius: 10px;
-        top: 20px;
-        right: 20px;
-        padding: 20px;
-        border: 2px solid white;
-        background: transparent;
-        color: white;
-        cursor: pointer;
-      "
-    >
-      evaluate
-    </button>
-    <div id="output"></div>
-    <script type="module" src="./main.js"></script>
-  </body>
-</html>

packages/core/examples/vite-vanilla-repl/main.js

@@ -1,26 +0,0 @@
-import { controls, repl, evalScope } from '@strudel.cycles/core';
-import { getAudioContext, webaudioOutput } from '@strudel.cycles/webaudio';
-import shapeshifter from '@strudel.cycles/eval/shapeshifter.mjs';
-import tune from './tune.mjs';
-
-const ctx = getAudioContext();
-const input = document.getElementById('text');
-input.innerHTML = tune;
-
-evalScope(
-  controls,
-  import('@strudel.cycles/core'),
-  import('@strudel.cycles/mini'),
-  import('@strudel.cycles/webaudio'),
-  import('@strudel.cycles/tonal'),
-);
-
-const { evaluate } = repl({
-  defaultOutput: webaudioOutput,
-  getTime: () => ctx.currentTime,
-  transpiler: shapeshifter,
-});
-document.getElementById('start').addEventListener('click', () => {
-  ctx.resume();
-  evaluate(input.value);
-});

packages/core/examples/vite-vanilla-repl/package-lock.json

@@ -1,885 +0,0 @@
-{
-  "name": "vite-vanilla-repl",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "vite-vanilla-repl",
-      "version": "0.0.0",
-      "devDependencies": {
-        "vite": "^3.2.0"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
-      "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
-      "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
-      "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.13",
-        "@esbuild/linux-loong64": "0.15.13",
-        "esbuild-android-64": "0.15.13",
-        "esbuild-android-arm64": "0.15.13",
-        "esbuild-darwin-64": "0.15.13",
-        "esbuild-darwin-arm64": "0.15.13",
-        "esbuild-freebsd-64": "0.15.13",
-        "esbuild-freebsd-arm64": "0.15.13",
-        "esbuild-linux-32": "0.15.13",
-        "esbuild-linux-64": "0.15.13",
-        "esbuild-linux-arm": "0.15.13",
-        "esbuild-linux-arm64": "0.15.13",
-        "esbuild-linux-mips64le": "0.15.13",
-        "esbuild-linux-ppc64le": "0.15.13",
-        "esbuild-linux-riscv64": "0.15.13",
-        "esbuild-linux-s390x": "0.15.13",
-        "esbuild-netbsd-64": "0.15.13",
-        "esbuild-openbsd-64": "0.15.13",
-        "esbuild-sunos-64": "0.15.13",
-        "esbuild-windows-32": "0.15.13",
-        "esbuild-windows-64": "0.15.13",
-        "esbuild-windows-arm64": "0.15.13"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
-      "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
-      "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
-      "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
-      "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
-      "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
-      "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
-      "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
-      "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
-      "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
-      "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
-      "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
-      "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
-      "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
-      "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
-      "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
-      "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
-      "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
-      "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
-      "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
-      "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/vite": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.2.tgz",
-      "integrity": "sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.15.9",
-        "postcss": "^8.4.18",
-        "resolve": "^1.22.1",
-        "rollup": "^2.79.1"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      },
-      "peerDependencies": {
-        "less": "*",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "less": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    }
-  },
-  "dependencies": {
-    "@esbuild/android-arm": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
-      "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
-      "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
-      "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
-      "dev": true,
-      "requires": {
-        "@esbuild/android-arm": "0.15.13",
-        "@esbuild/linux-loong64": "0.15.13",
-        "esbuild-android-64": "0.15.13",
-        "esbuild-android-arm64": "0.15.13",
-        "esbuild-darwin-64": "0.15.13",
-        "esbuild-darwin-arm64": "0.15.13",
-        "esbuild-freebsd-64": "0.15.13",
-        "esbuild-freebsd-arm64": "0.15.13",
-        "esbuild-linux-32": "0.15.13",
-        "esbuild-linux-64": "0.15.13",
-        "esbuild-linux-arm": "0.15.13",
-        "esbuild-linux-arm64": "0.15.13",
-        "esbuild-linux-mips64le": "0.15.13",
-        "esbuild-linux-ppc64le": "0.15.13",
-        "esbuild-linux-riscv64": "0.15.13",
-        "esbuild-linux-s390x": "0.15.13",
-        "esbuild-netbsd-64": "0.15.13",
-        "esbuild-openbsd-64": "0.15.13",
-        "esbuild-sunos-64": "0.15.13",
-        "esbuild-windows-32": "0.15.13",
-        "esbuild-windows-64": "0.15.13",
-        "esbuild-windows-arm64": "0.15.13"
-      }
-    },
-    "esbuild-android-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
-      "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-android-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
-      "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
-      "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
-      "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
-      "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
-      "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
-      "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
-      "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
-      "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
-      "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
-      "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
-      "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
-      "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
-      "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
-      "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
-      "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
-      "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
-      "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
-      "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.15.13",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
-      "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
-      "dev": true,
-      "optional": true
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-      "dev": true,
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "vite": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.2.tgz",
-      "integrity": "sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.15.9",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.18",
-        "resolve": "^1.22.1",
-        "rollup": "^2.79.1"
-      }
-    }
-  }
-}

packages/core/examples/vite-vanilla-repl/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "vite-vanilla-repl",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build --base /tidalcycles/strudel/general-purpose-scheduler/packages/core/examples/vite-vanilla-repl/dist/",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^3.2.0"
-  }
-}

packages/core/examples/vite-vanilla-repl/tune.mjs

@@ -1,31 +0,0 @@
-export default `await samples('github:tidalcycles/Dirt-Samples/master')
-
-stack(
-  // amen
-  n("0 1 2 3 4 5 6 7")
-  .sometimes(x=>x.ply(2))
-  .rarely(x=>x.speed("2 | -2"))
-  .sometimesBy(.4, x=>x.delay(".5"))
-  .s("amencutup")
-  .slow(2)
-  .room(.5)
-  ,
-  // bass
-  sine.add(saw.slow(4)).range(0,7).segment(8)
-  .superimpose(x=>x.add(.1))
-  .scale('G0 minor').note()
-  .s("sawtooth").decay(.1).sustain(0)
-  .gain(.4).cutoff(perlin.range(300,3000).slow(8)).resonance(10)
-  .degradeBy("0 0.1 .5 .1")
-  .rarely(add(note("12")))
-  ,
-  // chord
-  note("Bb3,D4".superimpose(x=>x.add(.2)))
-  .s('sawtooth').cutoff(1000).struct("<~@3 [~ x]>")
-  .decay(.05).sustain(.0).delay(.8).delaytime(.125).room(.8)
-  ,
-  // alien
-  s("breath").room(1).shape(.6).chop(16).rev().mask("<x ~@7>")
-  ,
-  n("0 1").s("east").delay(.5).degradeBy(.8).speed(rand.range(.5,1.5))
-).reset("<x@7 x(5,8)>")`;

packages/core/fraction.mjs

@@ -1,9 +1,3 @@
-/*
-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';
 
@@ -78,12 +72,6 @@ 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.“

packages/core/gist.js

@@ -1,12 +1,6 @@
-/*
-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, cache = true) =>
-  fetch(`https://gist.githubusercontent.com/${route}?cachebust=${cache ? '' : Date.now()}`)
+export default (route) =>
+  fetch(`https://gist.githubusercontent.com/${route}?cachebust=${Date.now()}`)
     .then((res) => res.text())
     .then((code) => eval(code));

packages/core/hap.mjs

@@ -1,8 +1,3 @@
-/*
-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 {
   /*
@@ -14,10 +9,7 @@ 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 word 'Event' is more or less a reserved word in javascript, hence this
-      class is named called 'Hap'.
+      The context is to store a list of source code locations causing the event
       */
 
   constructor(whole, part, value, context = {}, stateful = false) {
@@ -32,7 +24,7 @@ export class Hap {
   }
 
   get duration() {
-    return this.whole.end.sub(this.whole.begin);
+    return this.whole.end.sub(this.whole.begin).valueOf();
   }
 
   wholeOrPart() {
@@ -40,18 +32,18 @@ export class Hap {
   }
 
   withSpan(func) {
-    // Returns a new hap with the function f applies to the hap timespan.
+    // Returns a new event with the function f applies to the event 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 hap with the function f applies to the hap value.
+    // Returns a new event with the function f applies to the event value.
     return new Hap(this.whole, this.part, func(this.value), this.context);
   }
 
   hasOnset() {
-    // Test whether the hap contains the onset, i.e that
+    // Test whether the event 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);
   }
@@ -85,12 +77,6 @@ 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 || []) };
@@ -101,4 +87,4 @@ export class Hap {
   }
 }
 
-export default Hap;
+export default Hap;

packages/core/index.mjs

@@ -1,36 +1,11 @@
-/*
-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/>.
-*/
-
-import controls from './controls.mjs';
+export * from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-export { Fraction, controls };
+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 './speak.mjs';
-export * from './evaluate.mjs';
-export * from './repl.mjs';
-export { default as drawLine } from './drawLine.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;
+// export * from './value.mjs';

packages/core/package-lock.json

@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.3.1",
+	"version": "0.0.5",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/core",
-			"version": "0.1.0",
-			"license": "AGPL-3.0-or-later",
+			"version": "0.0.3",
+			"license": "GPL-3.0-or-later",
 			"dependencies": {
 				"bjork": "^0.0.1",
 				"fraction.js": "^4.2.0"

packages/core/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel.cycles/core",
-  "version": "0.3.1",
+  "version": "0.0.5",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
   "scripts": {
-    "test": "vitest run"
+    "test": "mocha --colors"
   },
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "algorave"
   ],
   "author": "Alex McLean <alex@slab.org> (https://slab.org)",
-  "license": "AGPL-3.0-or-later",
+  "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
@@ -28,5 +28,8 @@
     "bjork": "^0.0.1",
     "fraction.js": "^4.2.0"
   },
+  "devDependencies": {
+    "mocha": "^9.2.2"
+  },
   "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2"
 }

packages/core/repl.mjs

@@ -1,23 +0,0 @@
-import { Cyclist } from './cyclist.mjs';
-import { evaluate as _evaluate } from './evaluate.mjs';
-
-export function repl({ interval, defaultOutput, onSchedulerError, onEvalError, onEval, getTime, transpiler }) {
-  const scheduler = new Cyclist({ interval, onTrigger: defaultOutput, onError: onSchedulerError, getTime });
-  const evaluate = async (code) => {
-    if (!code) {
-      throw new Error('no code to evaluate');
-    }
-    try {
-      const { pattern } = await _evaluate(code, transpiler);
-      scheduler.setPattern(pattern, true);
-      onEval?.({
-        pattern,
-        code,
-      });
-    } catch (err) {
-      console.warn(`eval error: ${err.message}`);
-      onEvalError?.(err);
-    }
-  };
-  return { scheduler, evaluate };
-}

packages/core/signal.mjs

@@ -1,11 +1,5 @@
-/*
-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, isPattern } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';
 
@@ -22,61 +16,17 @@ 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)).note()
- * @example
- * saw.range(0,8).segment(8).scale('C major').slow(4).note()
- *
- */
 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').note()
- *
- */
 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').note()
- *
- */
 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').note()
- *
- */
 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
- * tri.segment(8).range(0,7).scale('C minor').note()
- *
- */
 export const tri = fastcat(isaw, saw);
 export const tri2 = fastcat(isaw2, saw2);
 
@@ -110,112 +60,25 @@ const timeToRandsPrime = (seed, n) => {
 
 const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
 
-/**
- *
- */
-
-/**
- * A continuous pattern of random numbers, between 0 and 1.
- *
- * @name rand
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(rand.range(500,2000))
- *
- */
 export const rand = signal(timeToRand);
-/**
- * A continuous pattern of random numbers, between -1 and 1
- */
-export const rand2 = rand._toBipolar();
 
 export const _brandBy = (p) => rand.fmap((x) => x < p);
 export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
 export const brand = _brandBy(0.5);
 
 export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
-
-/**
- * A continuous pattern of random integers, between 0 and n-1.
- *
- * @name irand
- * @param {number} n max value (exclusive)
- * @example
- * // randomly select scale notes from 0 - 7 (= C to C)
- * irand(8).struct("x(3,8)").scale('C minor').note()
- *
- */
 export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();
 
-export const __chooseWith = (pat, xs) => {
+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)]);
-};
-/**
- * Choose from the list of values (or patterns of values) using the given
- * pattern of numbers, which should be in the range of 0..1
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseWith = (pat, xs) => {
-  return __chooseWith(pat, xs).outerJoin();
+  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]).outerJoin();
 };
 
-/**
- * As with {chooseWith}, but the structure comes from the chosen values, rather
- * than the pattern you're using to choose with.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseInWith = (pat, xs) => {
-  return __chooseWith(pat, xs).innerJoin();
-};
-
-/**
- * Chooses randomly from the given list of elements.
- * @param  {...any} xs values / patterns to choose from.
- * @returns {Pattern} - a continuous pattern.
- */
 export const choose = (...xs) => chooseWith(rand, xs);
 
-/**
- * Chooses from the given list of values (or patterns of values), according
- * to the pattern that the method is called on. The pattern should be in
- * the range 0 .. 1.
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose = function (...xs) {
-  return chooseWith(this, xs);
-};
-
-/**
- * As with choose, but the pattern that this method is called on should be
- * in the range -1 .. 1
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose2 = function (...xs) {
-  return chooseWith(this._fromBipolar(), xs);
-};
-
-/**
- * Picks one of the elements at random each cycle.
- * @returns {Pattern}
- * @example
- * chooseCycles("bd", "hh", "sd").s().fast(4)
- * @example
- * "bd | hh | sd".s().fast(4)
- */
-export const chooseCycles = (...xs) => chooseInWith(rand.segment(1), xs);
-
-export const randcat = chooseCycles;
-
 const _wchooseWith = function (pat, ...pairs) {
   const values = pairs.map((pair) => reify(pair[0]));
   const weights = [];
@@ -225,20 +88,19 @@ const _wchooseWith = function (pat, ...pairs) {
     weights.push(accum);
   }
   const total = accum;
-  const match = function (r) {
+  const match = function(r) {
     const find = r * total;
     return values[weights.findIndex((x) => x > find, weights)];
   };
   return pat.fmap(match);
 };
 
-const wchooseWith = (...args) => _wchooseWith(...args).outerJoin();
+const wchooseWith = (...args) => _wchooseWith(...args).outerJoin()
 
 export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 
 export const wchooseCycles = (...pairs) => _wchooseWith(rand, ...pairs).innerJoin();
 
-// this function expects pat to be a pattern of floats...
 export const perlinWith = (pat) => {
   const pata = pat.fmap(Math.floor);
   const patb = pat.fmap((t) => Math.floor(t) + 1);
@@ -247,68 +109,20 @@ export const perlinWith = (pat) => {
   return pat.sub(pata).fmap(interp).appBoth(pata.fmap(timeToRand)).appBoth(patb.fmap(timeToRand));
 };
 
-/**
- * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
- *
- * @name perlin
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(perlin.range(500,2000))
- *
- */
-export const perlin = perlinWith(time.fmap((v) => Number(v)));
+export const perlin = perlinWith(time);
 
 Pattern.prototype._degradeByWith = function (withPat, x) {
   return this.fmap((a) => (_) => a).appLeft(withPat._filterValues((v) => v > x));
 };
 
-/**
- * Randomly removes events from the pattern by a given amount.
- * 0 = 0% chance of removal
- * 1 = 100% chance of removal
- *
- * @name degradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").degradeBy(0.2)
- * @example
- * s("[hh?0.2]*8")
- */
 Pattern.prototype._degradeBy = function (x) {
   return this._degradeByWith(rand, x);
 };
 
-/**
- *
- * Randomly removes 50% of events from the pattern. Shorthand for `.degradeBy(0.5)`
- *
- * @name degrade
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").degrade()
- * @example
- * s("[hh?]*8")
- */
 Pattern.prototype.degrade = function () {
   return this._degradeBy(0.5);
 };
 
-/**
- * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
- * 0 = 100% chance of removal
- * 1 = 0% chance of removal
- * Events that would be removed by degradeBy are let through by undegradeBy and vice versa (see second example).
- *
- * @name undegradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").undegradeBy(0.2)
- */
 Pattern.prototype._undegradeBy = function (x) {
   return this._degradeByWith(
     rand.fmap((r) => 1 - r),
@@ -324,25 +138,6 @@ Pattern.prototype._sometimesBy = function (x, func) {
   return stack(this._degradeBy(x), func(this._undegradeBy(1 - x)));
 };
 
-// https://github.com/tidalcycles/strudel/discussions/198
-/* Pattern.prototype._sometimesBy = function (x, other) {
-  other = typeof other === 'function' ? other(this._undegradeBy(1 - x)) : reify(other)._undegradeBy(1 - x);
-  return stack(this._degradeBy(x), other);
-}; */
-
-/**
- *
- * Randomly applies the given function by the given probability.
- * Similar to {@link Pattern#someCyclesBy}
- *
- * @name sometimesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
- */
 Pattern.prototype.sometimesBy = function (patx, func) {
   const pat = this;
   return reify(patx)
@@ -350,7 +145,6 @@ Pattern.prototype.sometimesBy = function (patx, func) {
     .innerJoin();
 };
 
-// why does this exist? it is identical to sometimesBy
 Pattern.prototype._sometimesByPre = function (x, func) {
   return stack(this._degradeBy(x), func(this).undegradeBy(1 - x));
 };
@@ -362,17 +156,6 @@ Pattern.prototype.sometimesByPre = function (patx, func) {
     .innerJoin();
 };
 
-/**
- *
- * Applies the given function with a 50% chance
- *
- * @name sometimes
- * @memberof Pattern
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh*4").sometimes(x=>x.speed("0.5"))
- */
 Pattern.prototype.sometimes = function (func) {
   return this._sometimesBy(0.5, func);
 };
@@ -388,19 +171,6 @@ Pattern.prototype._someCyclesBy = function (x, func) {
   );
 };
 
-/**
- *
- * Randomly applies the given function by the given probability on a cycle by cycle basis.
- * Similar to {@link Pattern#sometimesBy}
- *
- * @name someCyclesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
- */
 Pattern.prototype.someCyclesBy = function (patx, func) {
   const pat = this;
   return reify(patx)
@@ -408,100 +178,30 @@ Pattern.prototype.someCyclesBy = function (patx, func) {
     .innerJoin();
 };
 
-/**
- *
- * Shorthand for `.someCyclesBy(0.5, fn)`
- *
- * @name someCycles
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
- */
 Pattern.prototype.someCycles = function (func) {
   return this._someCyclesBy(0.5, func);
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(0.75, fn)`
- *
- * @name often
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").often(x=>x.speed("0.5"))
- */
 Pattern.prototype.often = function (func) {
   return this.sometimesBy(0.75, func);
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(0.25, fn)`
- *
- * @name rarely
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").rarely(x=>x.speed("0.5"))
- */
 Pattern.prototype.rarely = function (func) {
   return this.sometimesBy(0.25, func);
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(0.1, fn)`
- *
- * @name almostNever
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostNever(x=>x.speed("0.5"))
- */
 Pattern.prototype.almostNever = function (func) {
   return this.sometimesBy(0.1, func);
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(0.9, fn)`
- *
- * @name almostAlways
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostAlways(x=>x.speed("0.5"))
- */
 Pattern.prototype.almostAlways = function (func) {
   return this.sometimesBy(0.9, func);
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(0, fn)` (never calls fn)
- *
- * @name never
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").never(x=>x.speed("0.5"))
- */
 Pattern.prototype.never = function (func) {
   return this;
 };
 
-/**
- *
- * Shorthand for `.sometimesBy(1, fn)` (always calls fn)
- *
- * @name always
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").always(x=>x.speed("0.5"))
- */
 Pattern.prototype.always = function (func) {
   return func(this);
 };

packages/core/speak.mjs

@@ -1,18 +1,6 @@
-/*
-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';
 
-let synth;
-try {
-  synth = window?.speechSynthesis;
-} catch (err) {
-  console.warn('cannot use window: not in browser?');
-}
-
+const synth = window?.speechSynthesis;
 let allVoices = synth?.getVoices();
 // console.log('voices', allVoices);
 
@@ -32,11 +20,11 @@ function speak(words, lang, voice) {
 }
 
 Pattern.prototype._speak = function (lang, voice) {
-  return this._withHap((hap) => {
-    const onTrigger = (time, hap) => {
-      speak(hap.value, lang, voice);
+  return this._withEvent((event) => {
+    const onTrigger = (time, event) => {
+      speak(event.value, lang, voice);
     };
-    return hap.setContext({ ...hap.context, onTrigger });
+    return event.setContext({ ...event.context, onTrigger });
   });
 };
 

packages/core/state.mjs

@@ -1,9 +1,3 @@
-/*
-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;

packages/core/test/drawLine.test.mjs

@@ -1,46 +0,0 @@
-/*
-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 { describe, it, expect } from 'vitest';
-import drawLine from '../drawLine.mjs';
-
-describe('drawLine', () => {
-  it('supports equal lengths', () => {
-    expect(drawLine(fastcat(0), 4)).toEqual('|0|0');
-    expect(drawLine(fastcat(0, 1), 4)).toEqual('|01|01');
-    expect(drawLine(fastcat(0, 1, 2), 6)).toEqual('|012|012');
-  });
-  it('supports unequal lengths', () => {
-    expect(drawLine(fastcat(0, [1, 2]), 10)).toEqual('|0-12|0-12');
-    expect(drawLine(fastcat(0, [1, 2, 3]), 10)).toEqual('|0--123|0--123');
-    expect(drawLine(fastcat(0, 1, [2, 3]), 10)).toEqual('|0-1-23|0-1-23');
-  });
-  it('supports unequal silence', () => {
-    expect(drawLine(fastcat(0, silence, [1, 2]), 10)).toEqual('|0-..12|0-..12');
-  });
-  it('supports polyrhythms', () => {
-    // assert.equal(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10), '|0--0--1-1-1-');
-    expect(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10)).toEqual('|0--0--1-1-1-');
-  });
-  it('supports multiple lines', () => {
-    expect(drawLine(fastcat(0, stack(1, 2)), 10)).toEqual(`|01|01|01|01
-|.2|.2|.2|.2`);
-
-    expect(drawLine(fastcat(0, 1, stack(2, 3)), 10)).toEqual(`|012|012|012
-|..3|..3|..3`);
-
-    expect(drawLine(fastcat(0, stack(1, 2, 3)), 10)).toEqual(`|01|01|01|01
-|.2|.2|.2|.2
-|.3|.3|.3|.3`);
-    expect(drawLine(fastcat(0, 1, stack(2, 3, 4)), 10)).toEqual(`|012|012|012
-|..3|..3|..3
-|..4|..4|..4`);
-  });
-  it('supports unequal cycle lengths', () => {
-    expect(drawLine(slowcat(0, [1, 2]), 10)).toEqual(`|0|12|0|12`);
-  });
-});

packages/core/test/fraction.test.mjs

@@ -1,15 +0,0 @@
-/*
-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 { describe, it, expect } from 'vitest';
-
-describe('gcd', () => {
-  it('should work', () => {
-    const F = Fraction._original;
-    expect(gcd(F(1 / 6), F(1 / 4)).toFraction()).toEqual('1/12');
-  });
-});

packages/core/test/util.test.mjs

@@ -1,224 +1,114 @@
-/*
-util.test.mjs - Tests for the core 'util' module
-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 { pure } from '../pattern.mjs';
-import {
-  isNote,
-  tokenizeNote,
-  toMidi,
-  fromMidi,
-  mod,
-  compose,
-  getFrequency,
-  getPlayableNoteValue,
-  parseNumeral,
-  parseFractional,
-  numeralArgs,
-  fractionalArgs,
-} from '../util.mjs';
-import { describe, it, expect } from 'vitest';
+import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency } from '../util.mjs';
 
 describe('isNote', () => {
   it('should recognize notes without accidentals', () => {
     'C3 D3 E3 F3 G3 A3 B3 C4 D5 c5 d5 e5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
     });
   });
   it('should recognize notes with accidentals', () => {
     'C#3 D##3 Eb3 Fbb3 Bb5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
     });
   });
   it('should not recognize invalid notes', () => {
-    expect(isNote('H5')).toBe(false);
-    expect(isNote('C')).toBe(false);
-    expect(isNote('X')).toBe(false);
-    expect(isNote(1)).toBe(false);
+    assert.equal(isNote('H5'), false);
+    assert.equal(isNote('C'), false);
+    assert.equal(isNote('X'), false);
+    assert.equal(isNote(1), false);
   });
 });
 
 describe('isNote', () => {
   it('should tokenize notes without accidentals', () => {
-    expect(tokenizeNote('C3')).toStrictEqual(['C', '', 3]);
-    expect(tokenizeNote('D3')).toStrictEqual(['D', '', 3]);
-    expect(tokenizeNote('E3')).toStrictEqual(['E', '', 3]);
-    expect(tokenizeNote('F3')).toStrictEqual(['F', '', 3]);
-    expect(tokenizeNote('G3')).toStrictEqual(['G', '', 3]);
-    expect(tokenizeNote('A3')).toStrictEqual(['A', '', 3]);
-    expect(tokenizeNote('B3')).toStrictEqual(['B', '', 3]);
-    expect(tokenizeNote('C4')).toStrictEqual(['C', '', 4]);
-    expect(tokenizeNote('D5')).toStrictEqual(['D', '', 5]);
+    assert.deepStrictEqual(tokenizeNote('C3'), ['C', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('D3'), ['D', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('E3'), ['E', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('F3'), ['F', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('G3'), ['G', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('A3'), ['A', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('B3'), ['B', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('C4'), ['C', '', 4]);
+    assert.deepStrictEqual(tokenizeNote('D5'), ['D', '', 5]);
   });
   it('should tokenize notes with accidentals', () => {
-    expect(tokenizeNote('C#3')).toStrictEqual(['C', '#', 3]);
-    expect(tokenizeNote('D##3')).toStrictEqual(['D', '##', 3]);
-    expect(tokenizeNote('Eb3')).toStrictEqual(['E', 'b', 3]);
-    expect(tokenizeNote('Fbb3')).toStrictEqual(['F', 'bb', 3]);
-    expect(tokenizeNote('Bb5')).toStrictEqual(['B', 'b', 5]);
+    assert.deepStrictEqual(tokenizeNote('C#3'), ['C', '#', 3]);
+    assert.deepStrictEqual(tokenizeNote('D##3'), ['D', '##', 3]);
+    assert.deepStrictEqual(tokenizeNote('Eb3'), ['E', 'b', 3]);
+    assert.deepStrictEqual(tokenizeNote('Fbb3'), ['F', 'bb', 3]);
+    assert.deepStrictEqual(tokenizeNote('Bb5'), ['B', 'b', 5]);
   });
   it('should tokenize notes without octave', () => {
-    expect(tokenizeNote('C')).toStrictEqual(['C', '', undefined]);
-    expect(tokenizeNote('C#')).toStrictEqual(['C', '#', undefined]);
-    expect(tokenizeNote('Bb')).toStrictEqual(['B', 'b', undefined]);
-    expect(tokenizeNote('Bbb')).toStrictEqual(['B', 'bb', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C'), ['C', '', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C#'), ['C', '#', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bb'), ['B', 'b', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bbb'), ['B', 'bb', undefined]);
   });
   it('should not tokenize invalid notes', () => {
-    expect(tokenizeNote('X')).toStrictEqual([]);
-    expect(tokenizeNote('asfasf')).toStrictEqual([]);
-    expect(tokenizeNote(123)).toStrictEqual([]);
+    assert.deepStrictEqual(tokenizeNote('X'), []);
+    assert.deepStrictEqual(tokenizeNote('asfasf'), []);
+    assert.deepStrictEqual(tokenizeNote(123), []);
   });
 });
 describe('toMidi', () => {
   it('should turn notes into midi', () => {
-    expect(toMidi('A4')).toEqual(69);
-    expect(toMidi('C4')).toEqual(60);
-    expect(toMidi('Db4')).toEqual(61);
-    expect(toMidi('C3')).toEqual(48);
-    expect(toMidi('Cb3')).toEqual(47);
-    expect(toMidi('Cbb3')).toEqual(46);
-    expect(toMidi('C#3')).toEqual(49);
-    expect(toMidi('C#3')).toEqual(49);
-    expect(toMidi('C##3')).toEqual(50);
-  });
-  it('should throw an error when given a non-note', () => {
-    expect(() => toMidi('Q')).toThrowError(`not a note: "Q"`);
-    expect(() => toMidi('Z')).toThrowError(`not a note: "Z"`);
+    assert.equal(toMidi('A4'), 69);
+    assert.equal(toMidi('C4'), 60);
+    assert.equal(toMidi('Db4'), 61);
+    assert.equal(toMidi('C3'), 48);
+    assert.equal(toMidi('Cb3'), 47);
+    assert.equal(toMidi('Cbb3'), 46);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C##3'), 50);
   });
 });
 describe('fromMidi', () => {
   it('should turn midi into frequency', () => {
-    expect(fromMidi(69)).toEqual(440);
-    expect(fromMidi(57)).toEqual(220);
+    assert.equal(fromMidi(69), 440);
+    assert.equal(fromMidi(57), 220);
   });
 });
 describe('getFrequency', () => {
-  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
-  it('should turn note into frequency', () => {
-    expect(getFrequency(happify('a4'))).toEqual(440);
-    expect(getFrequency(happify('a3'))).toEqual(220);
-  });
   it('should turn midi into frequency', () => {
-    expect(getFrequency(happify(69, { type: 'midi' }))).toEqual(440);
-    expect(getFrequency(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequencies unchanged', () => {
-    expect(getFrequency(happify(440, { type: 'frequency' }))).toEqual(440);
-    expect(getFrequency(happify(432, { type: 'frequency' }))).toEqual(432);
-  });
-  it('should turn object with a "freq" property into frequency', () => {
-    expect(getFrequency(happify({ freq: 220 }))).toEqual(220);
-    expect(getFrequency(happify({ freq: 440 }))).toEqual(440);
-  });
-  it('should throw an error when given a non-note', () => {
-    expect(() => getFrequency(happify('Q'))).toThrowError(`not a note or frequency: Q`);
-    expect(() => getFrequency(happify('Z'))).toThrowError(`not a note or frequency: Z`);
+    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', () => {
-    expect(mod(0, 3)).toEqual(0);
-    expect(mod(1, 3)).toEqual(1);
-    expect(mod(2, 3)).toEqual(2);
-    expect(mod(3, 3)).toEqual(0);
-    expect(mod(4, 3)).toEqual(1);
-    expect(mod(4, 2)).toEqual(0);
+    assert.equal(mod(0, 3), 0);
+    assert.equal(mod(1, 3), 1);
+    assert.equal(mod(2, 3), 2);
+    assert.equal(mod(3, 3), 0);
+    assert.equal(mod(4, 3), 1);
+    assert.equal(mod(4, 2), 0);
   });
   it('should work with negative numbers', () => {
-    expect(mod(-1, 3)).toEqual(2);
-    expect(mod(-2, 3)).toEqual(1);
-    expect(mod(-3, 3)).toEqual(0);
-    expect(mod(-4, 3)).toEqual(2);
-    expect(mod(-5, 3)).toEqual(1);
-    expect(mod(-3, 2)).toEqual(1);
+    assert.equal(mod(-1, 3), 2);
+    assert.equal(mod(-2, 3), 1);
+    assert.equal(mod(-3, 3), 0);
+    assert.equal(mod(-4, 3), 2);
+    assert.equal(mod(-5, 3), 1);
+    assert.equal(mod(-3, 2), 1);
   });
 });
 
 describe('compose', () => {
   const add1 = (a) => a + 1;
   it('should compose', () => {
-    expect(compose(add1, add1)(0)).toEqual(2);
-    expect(compose(add1)(0)).toEqual(1);
+    assert.equal(compose(add1, add1)(0), 2);
+    assert.equal(compose(add1)(0), 1);
   });
   const addS = (s) => (a) => a + s;
   it('should compose left to right', () => {
-    expect(compose(addS('a'), addS('b'))('')).toEqual('ab');
-    expect(compose(addS('a'), addS('b'))('x')).toEqual('xab');
-  });
-});
-
-describe('getPlayableNoteValue', () => {
-  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
-  it('should return object "note" property', () => {
-    expect(getPlayableNoteValue(happify({ note: 'a4' }))).toEqual('a4');
-  });
-  it('should return object "n" property', () => {
-    expect(getPlayableNoteValue(happify({ n: 'a4' }))).toEqual('a4');
-  });
-  it('should return object "value" property', () => {
-    expect(getPlayableNoteValue(happify({ value: 'a4' }))).toEqual('a4');
-  });
-  it('should turn midi into frequency', () => {
-    expect(getPlayableNoteValue(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequency value', () => {
-    expect(getPlayableNoteValue(happify(220, { type: 'frequency' }))).toEqual(220);
-  });
-  it('should throw an error if value is not an object, number, or string', () => {
-    expect(() => getPlayableNoteValue(happify(false))).toThrowError(`not a note: false`);
-    expect(() => getPlayableNoteValue(happify(undefined))).toThrowError(`not a note: undefined`);
-  });
-});
-
-describe('parseNumeral', () => {
-  it('should parse numbers as is', () => {
-    expect(parseNumeral(4)).toBe(4);
-    expect(parseNumeral(0)).toBe(0);
-    expect(parseNumeral(20)).toBe(20);
-    expect(parseNumeral('20')).toBe(20);
-    expect(parseNumeral(1.5)).toBe(1.5);
-  });
-  it('should parse notes', () => {
-    expect(parseNumeral('c4')).toBe(60);
-    expect(parseNumeral('c#4')).toBe(61);
-    expect(parseNumeral('db4')).toBe(61);
-  });
-  it('should throw an error for unknown strings', () => {
-    expect(() => parseNumeral('xyz')).toThrowError('cannot parse as numeral: "xyz"');
-  });
-});
-
-describe('parseFractional', () => {
-  it('should parse numbers as is', () => {
-    expect(parseFractional(4)).toBe(4);
-    expect(parseFractional(0)).toBe(0);
-    expect(parseFractional(20)).toBe(20);
-    expect(parseFractional('20')).toBe(20);
-    expect(parseFractional(1.5)).toBe(1.5);
-  });
-  it('should parse fractional shorthands values', () => {
-    expect(parseFractional('w')).toBe(1);
-    expect(parseFractional('h')).toBe(0.5);
-    expect(parseFractional('q')).toBe(0.25);
-    expect(parseFractional('e')).toBe(0.125);
-  });
-  it('should throw an error for unknown strings', () => {
-    expect(() => parseFractional('xyz')).toThrowError('cannot parse as fractional: "xyz"');
-  });
-});
-
-describe('numeralArgs', () => {
-  it('should convert function arguments to numbers', () => {
-    const add = numeralArgs((a, b) => a + b);
-    expect(add('c4', 2)).toBe(62);
-  });
-});
-describe('fractionalArgs', () => {
-  it('should convert function arguments to numbers', () => {
-    const add = fractionalArgs((a, b) => a + b);
-    expect(add('q', 2)).toBe(2.25);
+    assert.equal(compose(addS('a'), addS('b'))(''), 'ab');
+    assert.equal(compose(addS('a'), addS('b'))('x'), 'xab');
   });
 });

packages/core/test/value.test.mjs

@@ -1,24 +1,18 @@
-/*
-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 { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';
 import { map, valued, mul } from '../value.mjs';
 
 describe('Value', () => {
   it('unionWith', () => {
     const { value } = valued({ freq: 2000, distortion: 1.2 }).unionWith({ distortion: 2 }, mul);
-    expect(value).toStrictEqual({ freq: 2000, distortion: 2.4 });
+    assert.deepStrictEqual(value, { freq: 2000, distortion: 2.4 });
   });
 
   it('experiments', () => {
-    expect(map(mul(5), valued(3)).value).toEqual(15);
-    expect(map(mul(null), valued(3)).value).toEqual(0);
-    expect(map(mul(3), valued(null)).value).toEqual(null);
-    expect(valued(3).map(mul).ap(3).value).toEqual(9);
-    expect(valued(mul).ap(3).ap(3).value).toEqual(9);
-    expect(valued(3).mul(3).value).toEqual(9);
+    assert.equal(map(mul(5), valued(3)).value, 15);
+    assert.equal(map(mul(null), valued(3)).value, 0);
+    assert.equal(map(mul(3), valued(null)).value, null);
+    assert.equal(valued(3).map(mul).ap(3).value, 9);
+    assert.equal(valued(mul).ap(3).ap(3).value, 9);
+    assert.equal(valued(3).mul(3).value, 9);
   });
 });

packages/core/timespan.mjs

@@ -1,9 +1,3 @@
-/*
-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 {
@@ -18,11 +12,6 @@ export class TimeSpan {
     const end = this.end;
     const end_sam = end.sam();
 
-    // Support zero-width timespans
-    if (begin.equals(end)) {
-      return([new TimeSpan(begin, end)]);
-    }
-    
     while (end.gt(begin)) {
       // If begin and end are in the same cycle, we're done.
       if (begin.sam().equals(end_sam)) {
@@ -39,16 +28,12 @@ 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.add(this.duration);
+    const e = b.add(this.end.sub(this.begin));
     return new TimeSpan(b, e);
   }
 
@@ -102,7 +87,7 @@ export class TimeSpan {
   }
 
   midpoint() {
-    return this.begin.add(this.duration.div(Fraction(2)));
+    return this.begin.add(this.end.sub(this.begin).div(Fraction(2)));
   }
 
   equals(other) {

packages/core/util.mjs

@@ -1,16 +1,10 @@
-/*
-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])([#bs]*)([0-9])?$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#b]*)([0-9])?$/)?.slice(1) || [];
   if (!pc) {
     return [];
   }
@@ -24,67 +18,43 @@ 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, s: 1 }[char], 0) || 0;
+  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1 }[char], 0) || 0;
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const fromMidi = (n) => {
   return Math.pow(2, (n - 69) / 12) * 440;
 };
 
-/**
- * @deprecated does not appear to be referenced or invoked anywhere in the codebase
- */
-export const getFreq = (noteOrMidi) => {
-  if (typeof noteOrMidi === 'number') {
-    return fromMidi(noteOrMidi);
-  }
-  return fromMidi(toMidi(noteOrMidi));
-};
-
-/**
- * @deprecated does not appear to be referenced or invoked anywhere in the codebase
- */
-export const midi2note = (n) => {
-  const oct = Math.floor(n / 12) - 1;
-  const pc = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'][n % 12];
-  return pc + oct;
-};
-
 // modulo that works with negative numbers e.g. mod(-1, 3) = 2
 // const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
-export const mod = (n, m) => ((n % m) + m) % m;
+export const mod = (n, m) => (n < 0 ? mod(n + m, m) : n % m);
 
-export const getPlayableNoteValue = (hap) => {
-  let { value: note, context } = hap;
-  if (typeof note === 'object' && !Array.isArray(note)) {
-    note = note.note || note.n || note.value;
+export const getPlayableNoteValue = (event) => {
+  let { value, context } = event;
+  if (typeof value === 'object') {
+    value = value.n || value.note;
   }
   // 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(hap.value);
-  } else if (typeof note === 'number' && context.type === 'frequency') {
-    note = hap.value; // legacy workaround.. will be removed in the future
-  } else if (typeof note !== 'string' || !isNote(note)) {
-    throw new Error('not a note: ' + JSON.stringify(note));
+  if (typeof value === 'number' && context.type !== 'frequency') {
+    value = fromMidi(event.value);
+  } else if (typeof value === 'string' && !isNote(value)) {
+    throw new Error('not a note: ' + value);
   }
-  return note;
+  return value;
 };
 
-export const getFrequency = (hap) => {
-  let { value, context } = hap;
+export const getFrequency = (event) => {
+  let { value, context } = event;
   // if value is number => interpret as midi number as long as its not marked as frequency
-  if (typeof value === 'object') {
-    if (value.freq) {
-      return value.freq;
-    }
-    return getFreq(value.note || value.n || value.value);
+  if (typeof value === 'object' && value.freq) {
+    return value.freq;
   }
   if (typeof value === 'number' && context.type !== 'frequency') {
-    value = fromMidi(hap.value);
+    value = fromMidi(event.value);
   } else if (typeof value === 'string' && isNote(value)) {
-    value = fromMidi(toMidi(hap.value));
+    value = fromMidi(toMidi(event.value));
   } else if (typeof value !== 'number') {
-    throw new Error('not a note or frequency: ' + value);
+    throw new Error('not a note or frequency:' + value);
   }
   return value;
 };
@@ -133,46 +103,3 @@ export function curry(func, overload) {
   }
   return fn;
 }
-
-export function parseNumeral(numOrString) {
-  const asNumber = Number(numOrString);
-  if (!isNaN(asNumber)) {
-    return asNumber;
-  }
-  if (isNote(numOrString)) {
-    return toMidi(numOrString);
-  }
-  throw new Error(`cannot parse as numeral: "${numOrString}"`);
-}
-
-export function mapArgs(fn, mapFn) {
-  return (...args) => fn(...args.map(mapFn));
-}
-
-export function numeralArgs(fn) {
-  return mapArgs(fn, parseNumeral);
-}
-
-export function parseFractional(numOrString) {
-  const asNumber = Number(numOrString);
-  if (!isNaN(asNumber)) {
-    return asNumber;
-  }
-  const specialValue = {
-    pi: Math.PI,
-    w: 1,
-    h: 0.5,
-    q: 0.25,
-    e: 0.125,
-    s: 0.0625,
-    t: 1 / 3,
-    f: 0.2,
-    x: 1 / 6,
-  }[numOrString];
-  if (typeof specialValue !== 'undefined') {
-    return specialValue;
-  }
-  throw new Error(`cannot parse as fractional: "${numOrString}"`);
-}
-
-export const fractionalArgs = (fn) => mapArgs(fn, parseFractional);

packages/core/value.mjs

@@ -1,12 +1,6 @@
-/*
-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';
 
-export function unionWithObj(a, b, func) {
+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])])));
 }

packages/core/zyklus.mjs

@@ -1,48 +0,0 @@
-// will move to https://github.com/felixroos/zyklus
-// TODO: started flag
-
-function createClock(
-  getTime,
-  callback, // called slightly before each cycle
-  duration = 0.05, // duration of each cycle
-  interval = 0.1, // interval between callbacks
-  overlap = 0.1, // overlap between callbacks
-) {
-  let tick = 0; // counts callbacks
-  let phase = 0; // next callback time
-  let precision = 10 ** 4; // used to round phase
-  let minLatency = 0.01;
-  const setDuration = (setter) => (duration = setter(duration));
-  overlap = overlap || interval / 2;
-  const onTick = () => {
-    const t = getTime();
-    const lookahead = t + interval + overlap; // the time window for this tick
-    if (phase === 0) {
-      phase = t + minLatency;
-    }
-    // callback as long as we're inside the lookahead
-    while (phase < lookahead) {
-      phase = Math.round(phase * precision) / precision;
-      phase >= t && callback(phase, duration, tick);
-      phase < t && console.log('TOO LATE', phase); // what if latency is added from outside?
-      phase += duration; // increment phase by duration
-      tick++;
-    }
-  };
-  let intervalID;
-  const start = () => {
-    onTick();
-    intervalID = setInterval(onTick, interval * 1000);
-  };
-  const clear = () => clearInterval(intervalID);
-  const pause = () => clear();
-  const stop = () => {
-    tick = 0;
-    phase = 0;
-    clear();
-  };
-  const getPhase = () => phase;
-  // setCallback
-  return { setDuration, start, stop, pause, duration, getPhase };
-}
-export default createClock;

packages/embed/README.md

@@ -1,33 +0,0 @@
-# @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>
-  <!--
-note(`[[e5 [b4 c5] d5 [c5 b4]]
-[a4 [a4 c5] e5 [d5 c5]]
-[b4 [~ c5] d5 e5]
-[c5 a4 a4 ~]
-[[~ d5] [~ f5] a5 [g5 f5]]
-[e5 [~ c5] e5 [d5 c5]]
-[b4 [b4 c5] d5 e5]
-[c5 a4 a4 ~]],
-[[e2 e3]*4]
-[[a2 a3]*4]
-[[g#2 g#3]*2 [e2 e3]*2]
-[a2 a3 a2 a3 a2 a3 b1 c2]
-[[d2 d3]*4]
-[[c2 c3]*4]
-[[b1 b2]*2 [e2 e3]*2]
-[[a1 a2]*4]`).slow(16)
-      -->
-</strudel-repl>
-```
-
-Note that the Code is placed inside HTML comments to prevent the browser from treating it as HTML.

packages/embed/embed.js

@@ -1,18 +0,0 @@
-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);

packages/embed/example.html

@@ -1,22 +0,0 @@
-<script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
-<!-- <script src="./embed.js"></script> -->
-<strudel-repl>
-  <!--
-note(`[[e5 [b4 c5] d5 [c5 b4]]
-[a4 [a4 c5] e5 [d5 c5]]
-[b4 [~ c5] d5 e5]
-[c5 a4 a4 ~]
-[[~ d5] [~ f5] a5 [g5 f5]]
-[e5 [~ c5] e5 [d5 c5]]
-[b4 [b4 c5] d5 e5]
-[c5 a4 a4 ~]],
-[[e2 e3]*4]
-[[a2 a3]*4]
-[[g#2 g#3]*2 [e2 e3]*2]
-[a2 a3 a2 a3 a2 a3 b1 c2]
-[[d2 d3]*4]
-[[c2 c3]*4]
-[[b1 b2]*2 [e2 e3]*2]
-[[a1 a2]*4]`).slow(16)
-      -->
-</strudel-repl>

packages/embed/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "@strudel.cycles/embed",
-  "version": "0.2.0",
-  "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"
-}

packages/eval/README.md

@@ -12,13 +12,10 @@ npm i @strudel.cycles/eval --save
 ## Example
 
 ```js
-import { evalScope } from '@strudel.cycles/core';
-import { evaluate } from '@strudel.cycles/eval';
+import { evaluate, extend } from '@strudel.cycles/eval';
+import * as strudel from '@strudel.cycles/core';
 
-evalScope(
-  import('@strudel.cycles/core'),
-  // import other strudel packages here
-); // add strudel to eval scope
+extend(strudel); // add strudel to eval scope
 
 async function run(code) {
   const { pattern } = await evaluate(code);

packages/eval/evaluate.mjs

@@ -1,12 +1,21 @@
-/*
-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 { evaluate as _evaluate } from '@strudel.cycles/core';
 import shapeshifter from './shapeshifter.mjs';
+import * as strudel from '@strudel.cycles/core';
+
+const { isPattern } = 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
+  Object.assign(globalThis, ...args);
+};
 
 export const evaluate = async (code) => {
-  return _evaluate(code, shapeshifter);
+  const shapeshifted = shapeshifter(code); // transform syntactically correct js code to semantically usable code
+  let evaluated = await eval(shapeshifted);
+  if (!isPattern(evaluated)) {
+    console.log('evaluated', evaluated);
+    const message = `got "${typeof evaluated}" instead of pattern`;
+    throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
+  }
+  return { mode: 'javascript', pattern: evaluated };
 };

packages/eval/index.mjs

@@ -1 +0,0 @@
-export * from './evaluate.mjs';

packages/eval/package-lock.json

@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/eval",
-	"version": "0.3.0",
+	"version": "0.0.5",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/eval",
-			"version": "0.1.1",
-			"license": "AGPL-3.0-or-later",
+			"version": "0.0.3",
+			"license": "GPL-3.0-or-later",
 			"dependencies": {
 				"estraverse": "^5.3.0",
 				"shift-ast": "^6.1.0",

packages/eval/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@strudel.cycles/eval",
-  "version": "0.3.0",
+  "version": "0.0.5",
   "description": "Code evaluator for strudel",
-  "main": "index.mjs",
-  "type": "module",
+  "main": "evaluate.mjs",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "vitest run"
+    "test": "mocha --colors"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tidalcycles/strudel.git"
   },
+  "type": "module",
   "keywords": [
     "tidalcycles",
     "strudel",
@@ -22,18 +22,18 @@
     "algorave"
   ],
   "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
+  "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.2.0",
+    "@strudel.cycles/core": "^0.0.5",
     "estraverse": "^5.3.0",
-    "shift-ast": "^7.0.0",
-    "shift-codegen": "^8.1.0",
-    "shift-parser": "^8.0.0",
-    "shift-spec": "^2019.0.0",
+    "shift-ast": "^6.1.0",
+    "shift-codegen": "^7.0.3",
+    "shift-parser": "^7.0.3",
+    "shift-spec": "^2018.0.2",
     "shift-traverser": "^1.0.0"
   }
 }

packages/eval/shapeshifter.mjs

@@ -1,9 +1,3 @@
-/*
-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';
@@ -29,12 +23,10 @@ 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);
-  const ast = parseScriptWithLocation(disguiseImports(code));
+  const ast = parseScriptWithLocation(code);
   const artificialNodes = [];
   const parents = [];
   const shifted = replace(ast.tree, {
@@ -46,18 +38,18 @@ export default (_code) => {
       }
 
       // replace template string `xxx` with mini(`xxx`)
-      if (minifyStrings && isBackTickString(node)) {
+      if (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 (minifyStrings && node.directives?.length === 1 && !node.statements?.length) {
+      if (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 (minifyStrings && isStringWithDoubleQuotes(node, ast.locations, code)) {
+      if (isStringWithDoubleQuotes(node, ast.locations, code)) {
         return minifyWithLocation(node, node, ast.locations, artificialNodes);
       }
 
@@ -125,33 +117,17 @@ export default (_code) => {
     },
   });
   // add return to last statement (because it's wrapped in an async function artificially)
-  if (wrappedAsync) {
-    addReturn(shifted);
-  }
-  const generated = undisguiseImports(codegen(shifted));
+  addReturn(shifted);
+  const generated = codegen(shifted);
   return generated;
 };
 
-// renames all import statements to "_mport" as Shift doesn't support dynamic import.
-// there shouldn't be any side-effects from this as this change does not affect
-// the syntax & will be undone by the equivalent replace in "undisguiseImports".
-function disguiseImports(code) {
-  return code.replaceAll('import', '_mport'); // Must be the same length!
-}
-
-// Rename the renamed import statements back to "import"
-function undisguiseImports(code) {
-  return code.replaceAll('_mport', 'import');
-}
-
 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
-  if (wrappedAsync) {
-    code = `(async () => {
+  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
@@ -228,10 +204,9 @@ 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' && factories.includes(node.callee.name);
+  return node?.type === 'CallExpression' && Object.keys(Pattern.prototype.factories).includes(node.callee.name);
 }
 
 function canBeOverloaded(node) {
@@ -258,14 +233,9 @@ 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: wrapped,
+      object: wrapFunction('mini', literalNode),
       property: 'withMiniLocation',
     }),
     arguments: args,
@@ -276,18 +246,17 @@ 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 + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.start.line - 1 }), // 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 + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.end.line - 1 }), // the minus 1 assumes the code has been wrapped in async iife
         new LiteralNumericExpression({ value: loc.end.column }),
         new LiteralNumericExpression({ value: loc.end.offset }),
       ],

packages/eval/shift-traverser/index.js

@@ -1,9 +1,3 @@
-/*
-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>
 

packages/eval/test/evaluate.test.mjs

@@ -1,32 +1,27 @@
-/*
-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 { expect, describe, it } from 'vitest';
-
-import { evaluate } from '../evaluate.mjs';
+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 { fastcat, evalScope } = strudel;
 
-describe('evaluate', async () => {
-  await evalScope({ mini }, strudel);
+const { cat } = strudel;
+
+extend({ mini }, strudel);
+
+describe('evaluate', () => {
   const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
   it('Should evaluate strudel functions', async () => {
-    expect(await ev('pure("c3")')).toEqual(['c3']);
-    expect(await ev('cat("c3")')).toEqual(['c3']);
-    expect(await ev('fastcat("c3", "d3")')).toEqual(['c3', 'd3']);
-    expect(await ev('slowcat("c3", "d3")')).toEqual(['c3']);
+    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('slowcat(c3, d3)'), ['c3']);
   });
-  it('Scope should be extendable', async () => {
-    await evalScope({ myFunction: (...x) => fastcat(...x) });
-    expect(await ev('myFunction("c3", "d3")')).toEqual(['c3', 'd3']);
+  it('Should be extendable', async () => {
+    extend({ myFunction: (...x) => cat(...x) });
+    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
   });
   it('Should evaluate simple double quoted mini notation', async () => {
-    expect(await ev('"c3"')).toEqual(['c3']);
-    expect(await ev('"c3 d3"')).toEqual(['c3', 'd3']);
-    expect(await ev('"<c3 d3>"')).toEqual(['c3']);
+    assert.deepStrictEqual(await ev('"c3"'), ['c3']);
+    assert.deepStrictEqual(await ev('"c3 d3"'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('"<c3 d3>"'), ['c3']);
   });
 });

packages/eval/test/shapeshifter.test.mjs

@@ -1,19 +1,8 @@
-/*
-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 { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';
 import shapeshifter from '../shapeshifter.mjs';
 
 describe('shapeshifter', () => {
   it('Should shift simple double quote string', () => {
-    expect(shapeshifter('"c3"')).toEqual('(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
-  });
-  it('Should handle dynamic imports', () => {
-    expect(shapeshifter('const { default: foo } = await import(\'https://bar.com/foo.js\');"c3"')).toEqual(
-      '(async()=>{const{default:foo}=await import("https://bar.com/foo.js");return mini("c3").withMiniLocation([1,64,79],[1,68,83])})()',
-    );
+    assert.equal(shapeshifter('"c3"'), '(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
   });
 });

packages/midi/index.mjs

@@ -1,3 +0,0 @@
-import './midi.mjs';
-
-export * from './midi.mjs';

packages/midi/midi.mjs

@@ -1,15 +1,10 @@
-/*
-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 * as _WebMidi from 'webmidi';
+import _WebMidi from 'webmidi';
 import { Pattern, isPattern } from '@strudel.cycles/core';
 import { Tone } from '@strudel.cycles/tone';
+
 // if you use WebMidi from outside of this package, make sure to import that instance:
-export const { WebMidi } = _WebMidi;
+export const WebMidi = _WebMidi;
 
 export function enableWebMidi() {
   return new Promise((resolve, reject) => {
@@ -38,11 +33,11 @@ Pattern.prototype.midi = function (output, channel = 1) {
       }')`,
     );
   }
-  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;
+  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;
       if (!isNote(note)) {
         throw new Error('not a note: ' + note);
       }
@@ -74,10 +69,10 @@ Pattern.prototype.midi = function (output, channel = 1) {
       // await enableWebMidi()
       device.playNote(note, channel, {
         time,
-        duration: hap.duration.valueOf() * 1000 - 5,
+        duration: event.duration * 1000 - 5,
         velocity,
       });
     };
-    return hap.setContext({ ...hap.context, onTrigger });
+    return event.setContext({ ...event.context, onTrigger });
   });
 };

packages/midi/package-lock.json

@@ -1,13 +1,13 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.3.0",
+	"version": "0.0.6",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@strudel.cycles/midi",
-			"version": "0.1.1",
-			"license": "AGPL-3.0-or-later",
+			"version": "0.0.4",
+			"license": "GPL-3.0-or-later",
 			"dependencies": {
 				"tone": "^14.7.77",
 				"webmidi": "^2.5.2"

packages/midi/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@strudel.cycles/midi",
-  "version": "0.3.0",
+  "version": "0.0.6",
   "description": "Midi API for strudel",
-  "main": "index.mjs",
+  "main": "midi.mjs",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tidalcycles/strudel.git"
@@ -15,14 +15,14 @@
     "algorave"
   ],
   "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
+  "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/tone": "^0.3.0",
+    "@strudel.cycles/tone": "^0.0.6",
     "tone": "^14.7.77",
-    "webmidi": "^3.0.21"
+    "webmidi": "^2.5.2"
   }
 }

packages/mini/README.md

@@ -33,12 +33,3 @@ yields:
 ## Mini Notation API
 
 See "Mini Notation" in the [Strudel Tutorial](https://strudel.tidalcycles.org/tutorial/)
-
-## Building the Parser
-
-The parser [krill-parser.js] is generated from [krill.pegjs](./krill.pegjs) using [peggy](https://peggyjs.org/).
-To generate the parser, run
-
-```js
-npm run build:parser
-```

packages/mini/index.mjs

@@ -1,2 +0,0 @@
-export * from './mini.mjs';
-export * from './krill-parser.js';

packages/mini/krill.pegjs

@@ -1,14 +1,7 @@
-/*
-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
 // a slice = a serie of horizontally aligned elements
-// a choose = a serie of elements, one of which is chosen at random
 
 
 {
@@ -82,18 +75,17 @@ DIGIT  = [0-9]
 // ------------------ delimiters ---------------------------
 
 ws "whitespace" = [ \n\r\t]*
-comma = ws "," ws
-pipe = ws "|" ws
+comma = ws "," ws;
 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]]
-sub_cycle = ws  "[" ws s:stack_or_choose ws "]" ws { return s}
+sub_cycle = ws  "[" ws s:stack ws "]" ws { return s}
 
 // define a timeline e.g <1 3 [3 5]>. We simply defer to a stack and change the alignement
 timeline = ws "<" ws sc:single_cycle ws ">" ws
@@ -104,7 +96,7 @@ slice = step / sub_cycle  / timeline
 
 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate / slice_degrade
+slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate
 
 slice_weight =  "@" a:number
   { return { weight: a} }
@@ -124,9 +116,6 @@ slice_fast = "*"a:number
 slice_fixed_step = "%"a:number
   { return { operator : { type_: "fixed-step", arguments_ :{ amount:a } } } }
 
-slice_degrade = "?"a:number?
-  { return { operator : { type_: "degradeBy", arguments_ :{ amount:(a? a : 0.5) } } } }
-
 // a slice with an modifier applied i.e [bd@4 sd@3]@2 hh]
 slice_with_modifier = s:slice o:slice_modifier?
   { return new ElementStub(s, o);}
@@ -137,22 +126,14 @@ single_cycle = s:(slice_with_modifier)+
   { return new PatternStub(s,"h"); }
 
 // a stack is a serie of vertically aligned single cycles, separated by a comma
-stack_tail = tail:(comma @single_cycle)+
-  { return { alignment: 'v', list: tail }; }
-
-// a choose is a serie of pipe-separated single cycles, one of which is chosen
-// at random each time through the pattern
-choose_tail = tail:(pipe @single_cycle)+
-  { return { alignment: 'r', list: tail }; }
-
 // if the stack contains only one element, we don't create a stack but return the
 // underlying element
-stack_or_choose = head:single_cycle tail:(stack_tail / choose_tail)?
-  { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment); } else { return head; } }
+stack = c:single_cycle cs:(comma v:single_cycle { return v})*
+  { if (cs.length == 0 && c instanceof Object) { return c;} else { cs.unshift(c); return new PatternStub(cs,"v");}  }
 
 // a sequence is a quoted stack
-sequence = ws quote sc:stack_or_choose quote
-  { return sc; }
+sequence = ws quote s:stack quote
+  { return s; }
 
 // ------------------ operators ---------------------------
 

packages/mini/mini.mjs

@@ -1,22 +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';
+import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
 
 const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
 
-var _seedState = 0;
-const randOffset = 0.0002;
-
-function _nextSeed() {
-  return _seedState++;
-}
-
 const applyOptions = (parent) => (pat, i) => {
   const ast = parent.source_[i];
   const options = ast.options_;
@@ -28,11 +15,6 @@ const applyOptions = (parent) => (pat, i) => {
         return reify(pat).fast(speed);
       case 'bjorklund':
         return pat.euclid(operator.arguments_.pulse, operator.arguments_.step, operator.arguments_.rotation);
-      case 'degradeBy':
-        return reify(pat)._degradeByWith(
-          strudel.rand.early(randOffset * _nextSeed()).segment(1),
-          operator.arguments_.amount,
-        );
       // TODO: case 'fixed-step': "%"
     }
     console.warn(`operator "${operator.type_}" not implemented`);
@@ -94,9 +76,6 @@ export function patternifyAST(ast) {
       if (alignment === 'v') {
         return stack(...children);
       }
-      if (alignment === 'r') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
-      }
       const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
       if (!weightedChildren && alignment === 't') {
         return slowcat(...children);
@@ -115,9 +94,9 @@ export function patternifyAST(ast) {
         return silence;
       }
       if (typeof ast.source_ !== 'object') {
-        /* if (!addMiniLocations) {
+        if (!addMiniLocations) {
           return ast.source_;
-        } */
+        }
         if (!ast.location_) {
           console.warn('no location for', ast);
           return ast.source_;

packages/mini/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@strudel.cycles/mini",
-  "version": "0.3.0",
+  "version": "0.0.7",
   "description": "Mini notation for strudel",
-  "main": "index.mjs",
+  "main": "mini.mjs",
   "type": "module",
   "scripts": {
-    "test": "vitest run",
-    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs"
+    "test": "mocha --colors"
   },
   "repository": {
     "type": "git",
@@ -20,17 +19,14 @@
     "algorave"
   ],
   "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
+  "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.2.0",
-    "@strudel.cycles/eval": "^0.3.0",
-    "@strudel.cycles/tone": "^0.3.0"
-  },
-  "devDependencies": {
-    "peggy": "^2.0.1"
+    "@strudel.cycles/core": "^0.0.5",
+    "@strudel.cycles/eval": "^0.0.5",
+    "@strudel.cycles/tone": "^0.0.6"
   }
 }

packages/mini/test/mini.test.mjs

@@ -1,107 +1,47 @@
-/*
-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';
-import { describe, expect, it } from 'vitest';
 
 describe('mini', () => {
   const minV = (v) => mini(v)._firstCycleValues;
   const minS = (v) => mini(v)._showFirstCycle;
   it('supports single elements', () => {
-    expect(minV('a')).toEqual(['a']);
+    assert.deepStrictEqual(minV('a'), ['a']);
   });
   it('supports rest', () => {
-    expect(minV('~')).toEqual([]);
+    assert.deepStrictEqual(minV('~'), []);
   });
   it('supports cat', () => {
-    expect(minS('a b')).toEqual(['a: 0 - 1/2', 'b: 1/2 - 1']);
-    expect(minS('a b c')).toEqual(['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
+    assert.deepStrictEqual(minS('a b'), ['a: 0 - 1/2', 'b: 1/2 - 1']);
+    assert.deepStrictEqual(minS('a b c'), ['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
   });
   it('supports slowcat', () => {
-    expect(minV('<a b>')).toEqual(['a']);
+    assert.deepStrictEqual(minV('<a b>'), ['a']);
   });
   it('supports division', () => {
-    expect(minS('a/2')).toEqual(['a: 0 - 2']);
-    expect(minS('[c3 d3]/2')).toEqual(['c3: 0 - 1']);
+    assert.deepStrictEqual(minS('a/2'), ['a: 0 - 2']);
+    assert.deepStrictEqual(minS('[c3 d3]/2'), ['c3: 0 - 1']);
   });
   it('supports multiplication', () => {
-    expect(minS('c3*2')).toEqual(['c3: 0 - 1/2', 'c3: 1/2 - 1']);
-    expect(minV('[c3 d3]*2')).toEqual(['c3', 'd3', 'c3', 'd3']);
+    assert.deepStrictEqual(minS('c3*2'), ['c3: 0 - 1/2', 'c3: 1/2 - 1']);
+    assert.deepStrictEqual(minV('[c3 d3]*2'), ['c3', 'd3', 'c3', 'd3']);
   });
   it('supports brackets', () => {
-    expect(minS('c3 [d3 e3]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
-    expect(minS('c3 [d3 [e3 f3]]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
+    assert.deepStrictEqual(minS('c3 [d3 e3]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
+    assert.deepStrictEqual(minS('c3 [d3 [e3 f3]]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
   });
   it('supports commas', () => {
-    expect(minS('c3,e3,g3')).toEqual(['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
-    expect(minS('[c3,e3,g3] f3')).toEqual(['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
+    assert.deepStrictEqual(minS('c3,e3,g3'), ['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
+    assert.deepStrictEqual(minS('[c3,e3,g3] f3'), ['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
   });
   it('supports elongation', () => {
-    expect(minS('a@3 b')).toEqual(['a: 0 - 3/4', 'b: 3/4 - 1']);
-    expect(minS('a@2 b@3')).toEqual(['a: 0 - 2/5', 'b: 2/5 - 1']);
+    assert.deepStrictEqual(minS('a@3 b'), ['a: 0 - 3/4', 'b: 3/4 - 1']);
+    assert.deepStrictEqual(minS('a@2 b@3'), ['a: 0 - 2/5', 'b: 2/5 - 1']);
   });
   it('supports replication', () => {
-    expect(minS('a!3 b')).toEqual(['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
+    assert.deepStrictEqual(minS('a!3 b'), ['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
   });
   it('supports euclidean rhythms', () => {
-    expect(minS('a(3, 8)')).toEqual(['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
-  });
-  it('supports the ? operator', () => {
-    expect(
-      mini('a?')
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    ).toEqual(
-      mini('a')
-        .degradeBy(0.5)
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    );
-  });
-  // testing things that involve pseudo-randomness, so there's a probability we could fail by chance.
-  // these next few tests work with the current PRNG, and are intended to succeed with p > 0.99 even if the PRNG changes
-  //   (as long as the PRNG has a relatively-uniform distribution of values)
-  it('supports degradeBy with default of 50%', () => {
-    const haps = mini('a?').queryArc(0, 1000);
-    expect(459 <= haps.length && haps.length <= 541).toBe(true);
-    // 'Number of elements did not fall in 99% confidence interval for binomial with p=0.5',
-  });
-  it('supports degradeBy with an argument', () => {
-    const haps = mini('a?0.8').queryArc(0, 1000);
-    expect(haps.length > 0).toBe(true);
-    // 'Should have had at least one element when degradeBy was set at 0.8');
-    expect(haps.length < 230).toBe(true);
-    // 'Had too many cycles remaining after degradeBy 0.8');
-  });
-  it('supports the random choice operator ("|") with nesting', () => {
-    const numCycles = 900;
-    const haps = mini('a | [b | c] | [d | e | f]').queryArc(0, numCycles);
-    // Should have about 1/3 a, 1/6 each of b | c, and 1/9 each of d | e | f.
-    // Evaluating this distribution with a chi-squared test.
-    // Note: this just evaluates the overall distribution, not things like correlation/runs of values
-    const observed = haps.reduce((acc, hap) => {
-      acc[hap.value] = (acc[hap.value] || 0) + 1;
-      return acc;
-    }, {});
-    const expected = {
-      a: numCycles / 3,
-      b: numCycles / 6,
-      c: numCycles / 6,
-      d: numCycles / 9,
-      e: numCycles / 9,
-      f: numCycles / 9,
-    };
-    let chisq = -numCycles;
-    for (let k in expected) {
-      chisq += (observed[k] * observed[k]) / expected[k];
-    }
-    // 15.086 is the chisq for 5 degrees of freedom at 99%, so for 99% of uniformly-distributed
-    //  PRNG, this test should succeed
-    expect(chisq <= 15.086).toBe(true);
-    // assert(chisq <= 15.086, chisq + ' was expected to be less than 15.086 under chi-squared test');
+    assert.deepStrictEqual(minS('a(3, 8)'), ['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
   });
 });