From 9e1ba442a948d9efc4b7740acc0dca15ba0f457c Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 21 Dec 2023 10:52:27 +0100 Subject: [PATCH 01/47] tree-sitter experiment --- packages/haskell/.gitignore | 26 ++++ packages/haskell/README.md | 25 ++++ packages/haskell/index.html | 13 ++ packages/haskell/main.js | 7 ++ packages/haskell/package.json | 20 +++ pnpm-lock.yaml | 231 ++++++++++++++++++++++++++++++++++ 6 files changed, 322 insertions(+) create mode 100644 packages/haskell/.gitignore create mode 100644 packages/haskell/README.md create mode 100644 packages/haskell/index.html create mode 100644 packages/haskell/main.js create mode 100644 packages/haskell/package.json diff --git a/packages/haskell/.gitignore b/packages/haskell/.gitignore new file mode 100644 index 00000000..30378b91 --- /dev/null +++ b/packages/haskell/.gitignore @@ -0,0 +1,26 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +public/tree-sitter.wasm \ No newline at end of file diff --git a/packages/haskell/README.md b/packages/haskell/README.md new file mode 100644 index 00000000..2769a416 --- /dev/null +++ b/packages/haskell/README.md @@ -0,0 +1,25 @@ +# @strudel/haskell + +This is an experiment in implementing tree-sitter for parsing haskell. + +So far, I have just set up a vite project that imports and inits `web-tree-sitter`, which works after + +- +- + +Running: + +```sh +cd haskell && pnpm i +pnpm dev +``` + +will start the vite dev server, loading tree sitter on `http://localhost:5174/`. + +The next step is be to generate `tree-sitter-haskell.wasm` file following . + +I've tried to generate it using but it failed, due to some versioning conflicts involving node / v8 / node-gyp. + +It seems a lot of work has gone into this package in , without a new npm package version being released, which is why I've written this comment: . + +So either someone authorized releases a new version of the package or we might need to pull the changes and try to build it from the tree-sitter master branch. diff --git a/packages/haskell/index.html b/packages/haskell/index.html new file mode 100644 index 00000000..18355039 --- /dev/null +++ b/packages/haskell/index.html @@ -0,0 +1,13 @@ + + + + + + + Tree sitter test + + +
+ + + diff --git a/packages/haskell/main.js b/packages/haskell/main.js new file mode 100644 index 00000000..e7d2c78b --- /dev/null +++ b/packages/haskell/main.js @@ -0,0 +1,7 @@ +import Parser from 'web-tree-sitter'; + +console.log('Parser', Parser); + +Parser.init().then(() => { + console.log('init done..'); +}); diff --git a/packages/haskell/package.json b/packages/haskell/package.json new file mode 100644 index 00000000..bcc05169 --- /dev/null +++ b/packages/haskell/package.json @@ -0,0 +1,20 @@ +{ + "name": "haskell", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview", + "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public" + }, + "devDependencies": { + "tree-sitter-cli": "^0.20.8", + "tree-sitter-javascript": "^0.20.1", + "vite": "^5.0.8" + }, + "dependencies": { + "web-tree-sitter": "^0.20.8" + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 98f6441f..db0a9dce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + importers: .: @@ -187,6 +191,22 @@ importers: packages/embed: {} + packages/haskell: + dependencies: + web-tree-sitter: + specifier: ^0.20.8 + version: 0.20.8 + devDependencies: + tree-sitter-cli: + specifier: ^0.20.8 + version: 0.20.8 + tree-sitter-javascript: + specifier: ^0.20.1 + version: 0.20.1 + vite: + specifier: ^5.0.8 + version: 5.0.10 + packages/hydra: dependencies: '@strudel.cycles/core': @@ -4053,6 +4073,110 @@ packages: rollup: 2.79.1 dev: true + /@rollup/rollup-android-arm-eabi@4.9.1: + resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-android-arm64@4.9.1: + resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-arm64@4.9.1: + resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-x64@4.9.1: + resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.9.1: + resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.9.1: + resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-musl@4.9.1: + resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.9.1: + resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.9.1: + resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.9.1: + resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.9.1: + resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.9.1: + resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.9.1: + resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@sigstore/protobuf-specs@0.1.0: resolution: {integrity: sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -5572,6 +5696,7 @@ packages: /b4a@1.6.4: resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==} + requiresBuild: true optional: true /babel-plugin-add-module-exports@0.2.1: @@ -6154,6 +6279,7 @@ packages: /color-string@1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + requiresBuild: true dependencies: color-name: 1.1.4 simple-swizzle: 0.2.2 @@ -6166,6 +6292,7 @@ packages: /color@4.2.3: resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} engines: {node: '>=12.5.0'} + requiresBuild: true dependencies: color-convert: 2.0.1 color-string: 1.9.1 @@ -6629,6 +6756,7 @@ packages: /detect-libc@2.0.2: resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} engines: {node: '>=8'} + requiresBuild: true optional: true /detective-amd@4.0.1: @@ -7472,6 +7600,7 @@ packages: /fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} + requiresBuild: true optional: true /fast-glob@3.2.12: @@ -7743,6 +7872,14 @@ packages: requiresBuild: true optional: true + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + dev: true + optional: true + /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} @@ -10521,6 +10658,12 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + dev: true + /nanoid@4.0.2: resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==} engines: {node: ^14 || ^16 || >=18} @@ -10579,6 +10722,7 @@ packages: /node-addon-api@6.1.0: resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} + requiresBuild: true optional: true /node-domexception@1.0.0: @@ -11675,6 +11819,15 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.32: + resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} engines: {node: '>=10'} @@ -11875,6 +12028,7 @@ packages: /queue-tick@1.0.1: resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==} + requiresBuild: true optional: true /quick-lru@4.0.1: @@ -12522,6 +12676,27 @@ packages: optionalDependencies: fsevents: 2.3.2 + /rollup@4.9.1: + resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.9.1 + '@rollup/rollup-android-arm64': 4.9.1 + '@rollup/rollup-darwin-arm64': 4.9.1 + '@rollup/rollup-darwin-x64': 4.9.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 + '@rollup/rollup-linux-arm64-gnu': 4.9.1 + '@rollup/rollup-linux-arm64-musl': 4.9.1 + '@rollup/rollup-linux-riscv64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-musl': 4.9.1 + '@rollup/rollup-win32-arm64-msvc': 4.9.1 + '@rollup/rollup-win32-ia32-msvc': 4.9.1 + '@rollup/rollup-win32-x64-msvc': 4.9.1 + fsevents: 2.3.3 + dev: true + /run-async@2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} @@ -12730,6 +12905,7 @@ packages: /simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + requiresBuild: true dependencies: is-arrayish: 0.3.2 optional: true @@ -12943,6 +13119,7 @@ packages: /streamx@2.15.2: resolution: {integrity: sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg==} + requiresBuild: true dependencies: fast-fifo: 1.3.2 queue-tick: 1.0.1 @@ -13220,6 +13397,7 @@ packages: /tar-fs@3.0.4: resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==} + requiresBuild: true dependencies: mkdirp-classic: 0.5.3 pump: 3.0.0 @@ -13238,6 +13416,7 @@ packages: /tar-stream@3.1.6: resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==} + requiresBuild: true dependencies: b4a: 1.6.4 fast-fifo: 1.3.2 @@ -13429,6 +13608,19 @@ packages: punycode: 2.3.0 dev: true + /tree-sitter-cli@0.20.8: + resolution: {integrity: sha512-XjTcS3wdTy/2cc/ptMLc/WRyOLECRYcMTrSWyhZnj1oGSOWbHLTklgsgRICU3cPfb0vy+oZCC33M43u6R1HSCA==} + hasBin: true + requiresBuild: true + dev: true + + /tree-sitter-javascript@0.20.1: + resolution: {integrity: sha512-2LNRAw6vd6NDGf5DvAZTaIJDv0j7519bbDsQQ9jnT7uC91efvbn2BxOagNs7u41LSbmsuScjkM8VeN0mnya1iw==} + requiresBuild: true + dependencies: + nan: 2.17.0 + dev: true + /treeverse@3.0.0: resolution: {integrity: sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -14141,6 +14333,41 @@ packages: optionalDependencies: fsevents: 2.3.2 + /vite@5.0.10: + resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.19.5 + postcss: 8.4.32 + rollup: 4.9.1 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vitefu@0.2.4(vite@4.5.0): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: @@ -14267,6 +14494,10 @@ packages: engines: {node: '>= 8'} dev: true + /web-tree-sitter@0.20.8: + resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==} + dev: false + /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} From 756f37e265d50003b1371f962e7200fba09930d1 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 21 Dec 2023 10:54:12 +0100 Subject: [PATCH 02/47] format --- packages/haskell/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/haskell/index.html b/packages/haskell/index.html index 18355039..c6b59eed 100644 --- a/packages/haskell/index.html +++ b/packages/haskell/index.html @@ -1,4 +1,4 @@ - + From 64dbdd97baaefbc02d1558320bdcc00345ea7376 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 29 Dec 2023 21:27:54 +0100 Subject: [PATCH 03/47] little update --- packages/haskell/.gitignore | 3 ++- packages/haskell/README.md | 6 ++++++ packages/haskell/main.js | 8 ++++++-- packages/haskell/public/README.md | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 packages/haskell/public/README.md diff --git a/packages/haskell/.gitignore b/packages/haskell/.gitignore index 30378b91..213c8054 100644 --- a/packages/haskell/.gitignore +++ b/packages/haskell/.gitignore @@ -23,4 +23,5 @@ dist-ssr *.sln *.sw? -public/tree-sitter.wasm \ No newline at end of file +public/tree-sitter.wasm +public/tree-sitter-haskell.wasm \ No newline at end of file diff --git a/packages/haskell/README.md b/packages/haskell/README.md index 2769a416..0143b93e 100644 --- a/packages/haskell/README.md +++ b/packages/haskell/README.md @@ -23,3 +23,9 @@ I've tried to generate it using , without a new npm package version being released, which is why I've written this comment: . So either someone authorized releases a new version of the package or we might need to pull the changes and try to build it from the tree-sitter master branch. + +## Update 1 + +I've managed to make it work by using [this tree-sitter-haskell.wasm](https://github.com/tree-sitter/tree-sitter-haskell/blob/master/tree-sitter-haskell.wasm), instead of using the version on npm! Make sure both `tree-sitter.wasm` and `tree-sitter-haskell.wasm` are in the public dir, then run `pnpm dev`. The console should log a tree sitter AST string. + +Next step: understand how the ast works to then transform it into JS function calls! diff --git a/packages/haskell/main.js b/packages/haskell/main.js index e7d2c78b..dd96e32f 100644 --- a/packages/haskell/main.js +++ b/packages/haskell/main.js @@ -2,6 +2,10 @@ import Parser from 'web-tree-sitter'; console.log('Parser', Parser); -Parser.init().then(() => { - console.log('init done..'); +Parser.init().then(async () => { + const parser = new Parser(); + const Lang = await Parser.Language.load('tree-sitter-haskell.wasm'); + parser.setLanguage(Lang); + const tree = parser.parse('d1 $ s "hh*3"'); + console.log(tree.rootNode.toString()); }); diff --git a/packages/haskell/public/README.md b/packages/haskell/public/README.md new file mode 100644 index 00000000..6f8ff001 --- /dev/null +++ b/packages/haskell/public/README.md @@ -0,0 +1,3 @@ +# public + +this file is just here to make sure the public folder exists From a39b4c1637bfb048e6175280171c9aaa8530d1cb Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sat, 30 Dec 2023 16:43:08 +0100 Subject: [PATCH 04/47] parser viz --- packages/haskell/.gitignore | 3 +- packages/haskell/index.html | 5 +- packages/haskell/main.js | 50 ++++++++++++++-- packages/haskell/package.json | 6 +- pnpm-lock.yaml | 110 +++++++++++++++++++++++++++++++++- 5 files changed, 162 insertions(+), 12 deletions(-) diff --git a/packages/haskell/.gitignore b/packages/haskell/.gitignore index 213c8054..aa33e831 100644 --- a/packages/haskell/.gitignore +++ b/packages/haskell/.gitignore @@ -24,4 +24,5 @@ dist-ssr *.sw? public/tree-sitter.wasm -public/tree-sitter-haskell.wasm \ No newline at end of file +public/tree-sitter-haskell.wasm +public/tree-sitter-haskell_mine.wasm \ No newline at end of file diff --git a/packages/haskell/index.html b/packages/haskell/index.html index c6b59eed..23d1c4a6 100644 --- a/packages/haskell/index.html +++ b/packages/haskell/index.html @@ -6,8 +6,9 @@ Tree sitter test - -
+ + +
diff --git a/packages/haskell/main.js b/packages/haskell/main.js index dd96e32f..df11110a 100644 --- a/packages/haskell/main.js +++ b/packages/haskell/main.js @@ -1,11 +1,51 @@ import Parser from 'web-tree-sitter'; +import toDot from 'jgf-dot'; +import { Graphviz } from '@hpcc-js/wasm'; -console.log('Parser', Parser); +const graphvizLoaded = Graphviz.load(); +const parserLoaded = loadParser(); +const graphContainer = document.getElementById('graph'); -Parser.init().then(async () => { +const textarea = document.getElementById('code'); +textarea.value = 'd1 $ s "hh(3,8)"'; +textarea.addEventListener('input', (e) => renderGraph(e.target.value, graphContainer)); +renderGraph(textarea.value, graphContainer); + +function walk(node, branch = [0], parent) { + let nodes = []; + let edges = []; + const current = { id: branch.join('-'), label: node.type }; + nodes.push(current); + parent && edges.push({ source: parent.id, target: current.id }); + if (node.children.length) { + node.children.forEach((child, j) => { + const { nodes: childNodes, edges: childEdges } = walk(child, branch.concat([j]), current); + nodes = nodes.concat(childNodes || []); + edges = edges.concat(childEdges || []); + }); + } + return { nodes, edges }; +} + +async function renderGraph(code, container) { + const parser = await parserLoaded; + const tree = parser.parse(code); + const { nodes, edges } = walk(tree.rootNode); + const graphviz = await graphvizLoaded; + const dot = toDot({ + graph: { + nodes, + edges, + }, + }); + const svg = await graphviz.layout(dot, 'svg', 'dot'); + container.innerHTML = svg; +} + +async function loadParser() { + await Parser.init(); const parser = new Parser(); const Lang = await Parser.Language.load('tree-sitter-haskell.wasm'); parser.setLanguage(Lang); - const tree = parser.parse('d1 $ s "hh*3"'); - console.log(tree.rootNode.toString()); -}); + return parser; +} diff --git a/packages/haskell/package.json b/packages/haskell/package.json index bcc05169..46039e25 100644 --- a/packages/haskell/package.json +++ b/packages/haskell/package.json @@ -7,14 +7,18 @@ "dev": "vite", "build": "vite build", "preview": "vite preview", - "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public" + "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public", + "parse": "tree-sitter parse -D ./test.hs" }, "devDependencies": { + "tree-sitter": "^0.20.6", "tree-sitter-cli": "^0.20.8", "tree-sitter-javascript": "^0.20.1", "vite": "^5.0.8" }, "dependencies": { + "@hpcc-js/wasm": "^2.15.3", + "jgf-dot": "^1.1.1", "web-tree-sitter": "^0.20.8" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44efa683..5f77b9ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -240,10 +240,19 @@ importers: packages/haskell: dependencies: + '@hpcc-js/wasm': + specifier: ^2.15.3 + version: 2.15.3 + jgf-dot: + specifier: ^1.1.1 + version: 1.1.1 web-tree-sitter: specifier: ^0.20.8 version: 0.20.8 devDependencies: + tree-sitter: + specifier: ^0.20.6 + version: 0.20.6 tree-sitter-cli: specifier: ^0.20.8 version: 0.20.8 @@ -2914,6 +2923,13 @@ packages: react: 18.2.0 dev: false + /@hpcc-js/wasm@2.15.3: + resolution: {integrity: sha512-enmVW4APrv6jBCRP5V/WdIjYvxidNgBbgdWOdLpiygoE0g0ZurM1qsysBo4TbZfdS81SCdkjRSU/URWf+gpQUA==} + hasBin: true + dependencies: + yargs: 17.7.2 + dev: false + /@humanwhocodes/config-array@0.11.8: resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} engines: {node: '>=10.10.0'} @@ -6423,7 +6439,6 @@ packages: resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} engines: {node: '>=8'} requiresBuild: true - optional: true /detective-amd@4.0.1: resolution: {integrity: sha512-bDo22IYbJ8yzALB0Ow5CQLtyhU1BpDksLB9dsWHI9Eh0N3OQR6aQqhjPsNDd69ncYwRfL1sTo7OA9T3VRVSe2Q==} @@ -6593,6 +6608,10 @@ packages: engines: {node: '>=10'} dev: true + /dotty@0.0.1: + resolution: {integrity: sha512-eDT0hfJEnQbGaZcTuCfj2igPkQ7qa/n9K2pGGDxhEqKhARLq+xE1TonvpOPHq+7KeG+D6A/V8BwCcsdPom2TQg==} + dev: false + /dset@3.1.2: resolution: {integrity: sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==} engines: {node: '>=4'} @@ -7560,6 +7579,10 @@ packages: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} dev: true + /gather-stream@1.0.0: + resolution: {integrity: sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==} + dev: false + /gauge@3.0.2: resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} engines: {node: '>=10'} @@ -7898,6 +7921,33 @@ packages: /grapheme-splitter@1.0.4: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} + /graphlib-dot@0.6.4: + resolution: {integrity: sha512-rdhDTu0mBlloTpFMfkQq+e3y4yL22OqP5MhQbkw6QUURqa+4YLgv3XZy2fA64wdEcJNZ+waI76URemVgdFtzng==} + dependencies: + graphlib: 2.1.8 + lodash: 4.17.21 + dev: false + + /graphlib-json-graph@1.0.0: + resolution: {integrity: sha512-sJsFuthZnSL5knaDDZhDx8fg1Zy5t/7ZqVHiytoeSzezGhMoSFD3T3K5YQakKFEyXtYjOzbnvsyr2qo+6/qq/Q==} + dependencies: + graphlib: 1.0.7 + par: 0.3.0 + prop: 0.1.1 + dev: false + + /graphlib@1.0.7: + resolution: {integrity: sha512-jNb7RbqTIRyZRmcVCxGefOlGWjNdbjcT2tFj36zhnRa8yhAlOvydh9nBixfLQIqSU+DwCx47tg3ysw8NIYhpsA==} + dependencies: + lodash: 3.10.1 + dev: false + + /graphlib@2.1.8: + resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==} + dependencies: + lodash: 4.17.21 + dev: false + /gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -8794,6 +8844,15 @@ packages: supports-color: 7.2.0 dev: true + /jgf-dot@1.1.1: + resolution: {integrity: sha512-/aw9bwVfn67A+lvjxtbocBuhB2rNdL5UY5rlHhKVh9ValvVJETU5lQ0jitDxiIjIPAEeuR4B1aFNA7E3wKNV1A==} + hasBin: true + dependencies: + graphlib-dot: 0.6.4 + graphlib-json-graph: 1.0.0 + read-file-stdin: 0.2.1 + dev: false + /jiti@1.18.2: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true @@ -9257,9 +9316,12 @@ packages: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} dev: true + /lodash@3.10.1: + resolution: {integrity: sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==} + dev: false + /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - dev: true /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} @@ -10316,6 +10378,10 @@ packages: /nan@2.17.0: resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} + /nan@2.18.0: + resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==} + dev: true + /nanoid@3.3.6: resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -11118,6 +11184,11 @@ packages: - supports-color dev: true + /par@0.3.0: + resolution: {integrity: sha512-6V910zFAoHnxjX6ILkwbQcpIkD3KI2gBAPfCtZQNaJTvTxgIoKXSwDQIE3ty0zbOGdBXHRnl6rd66a5jj12pfw==} + engines: {node: '>=0.6'} + dev: false + /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -11499,7 +11570,7 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - detect-libc: 2.0.1 + detect-libc: 2.0.2 expand-template: 2.0.3 github-from-package: 0.0.0 minimist: 1.2.7 @@ -11659,6 +11730,12 @@ packages: read: 1.0.7 dev: true + /prop@0.1.1: + resolution: {integrity: sha512-hf5DdgiPkcoVxBfuSknP918U0lDC+7lArIjIB2U4Gh79p1Xtc0JP6W5DW3c0wC0x9/A6CsAISh3202I1GlMgkw==} + dependencies: + dotty: 0.0.1 + dev: false + /property-information@6.2.0: resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==} @@ -11792,6 +11869,12 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dev: true + /read-file-stdin@0.2.1: + resolution: {integrity: sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==} + dependencies: + gather-stream: 1.0.0 + dev: false + /read-package-json-fast@2.0.3: resolution: {integrity: sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==} engines: {node: '>=10'} @@ -13294,6 +13377,14 @@ packages: nan: 2.17.0 dev: true + /tree-sitter@0.20.6: + resolution: {integrity: sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==} + requiresBuild: true + dependencies: + nan: 2.18.0 + prebuild-install: 7.1.1 + dev: true + /treeverse@3.0.0: resolution: {integrity: sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -14592,6 +14683,19 @@ packages: y18n: 5.0.8 yargs-parser: 21.1.1 + /yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + dependencies: + cliui: 8.0.1 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + dev: false + /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} From 89ae241bf7f74ca77b0ad03b38c8a45e6aaa0470 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sat, 30 Dec 2023 16:45:03 +0100 Subject: [PATCH 05/47] some styling --- packages/haskell/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/haskell/index.html b/packages/haskell/index.html index 23d1c4a6..9883b1b9 100644 --- a/packages/haskell/index.html +++ b/packages/haskell/index.html @@ -7,8 +7,8 @@ Tree sitter test - -
+ +
From eefd8b37b11b3b2f2b74ecafbb86a6a85795175f Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sat, 30 Dec 2023 16:48:21 +0100 Subject: [PATCH 06/47] ignore their wasm file --- packages/haskell/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/haskell/.gitignore b/packages/haskell/.gitignore index aa33e831..75d4123f 100644 --- a/packages/haskell/.gitignore +++ b/packages/haskell/.gitignore @@ -25,4 +25,5 @@ dist-ssr public/tree-sitter.wasm public/tree-sitter-haskell.wasm -public/tree-sitter-haskell_mine.wasm \ No newline at end of file +public/tree-sitter-haskell_mine.wasm +public/tree-sitter-haskell_theirs.wasm \ No newline at end of file From 179931be88056cac4cb4d35579637a2e37c1eec4 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 16 May 2024 14:10:42 +0200 Subject: [PATCH 07/47] fix lockfile: reset to main one --- pnpm-lock.yaml | 98 ++------------------------------------------------ 1 file changed, 3 insertions(+), 95 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a085314..de4f9185 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -251,31 +251,6 @@ importers: packages/embed: {} - packages/haskell: - dependencies: - '@hpcc-js/wasm': - specifier: ^2.15.3 - version: 2.15.3 - jgf-dot: - specifier: ^1.1.1 - version: 1.1.1 - web-tree-sitter: - specifier: ^0.20.8 - version: 0.20.8 - devDependencies: - tree-sitter: - specifier: ^0.20.6 - version: 0.20.6 - tree-sitter-cli: - specifier: ^0.20.8 - version: 0.20.8 - tree-sitter-javascript: - specifier: ^0.20.1 - version: 0.20.1 - vite: - specifier: ^5.0.8 - version: 5.0.10 - packages/hydra: dependencies: '@strudel/core': @@ -8228,33 +8203,6 @@ packages: /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - /graphlib-dot@0.6.4: - resolution: {integrity: sha512-rdhDTu0mBlloTpFMfkQq+e3y4yL22OqP5MhQbkw6QUURqa+4YLgv3XZy2fA64wdEcJNZ+waI76URemVgdFtzng==} - dependencies: - graphlib: 2.1.8 - lodash: 4.17.21 - dev: false - - /graphlib-json-graph@1.0.0: - resolution: {integrity: sha512-sJsFuthZnSL5knaDDZhDx8fg1Zy5t/7ZqVHiytoeSzezGhMoSFD3T3K5YQakKFEyXtYjOzbnvsyr2qo+6/qq/Q==} - dependencies: - graphlib: 1.0.7 - par: 0.3.0 - prop: 0.1.1 - dev: false - - /graphlib@1.0.7: - resolution: {integrity: sha512-jNb7RbqTIRyZRmcVCxGefOlGWjNdbjcT2tFj36zhnRa8yhAlOvydh9nBixfLQIqSU+DwCx47tg3ysw8NIYhpsA==} - dependencies: - lodash: 3.10.1 - dev: false - - /graphlib@2.1.8: - resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==} - dependencies: - lodash: 4.17.21 - dev: false - /gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -9610,12 +9558,9 @@ packages: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} dev: true - /lodash@3.10.1: - resolution: {integrity: sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==} - dev: false - /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: true /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} @@ -11321,11 +11266,6 @@ packages: - supports-color dev: true - /par@0.3.0: - resolution: {integrity: sha512-6V910zFAoHnxjX6ILkwbQcpIkD3KI2gBAPfCtZQNaJTvTxgIoKXSwDQIE3ty0zbOGdBXHRnl6rd66a5jj12pfw==} - engines: {node: '>=0.6'} - dev: false - /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -11661,21 +11601,12 @@ packages: picocolors: 1.0.0 source-map-js: 1.2.0 - /postcss@8.4.32: - resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.0.2 - dev: true - /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} engines: {node: '>=10'} hasBin: true dependencies: - detect-libc: 2.0.2 + detect-libc: 2.0.1 expand-template: 2.0.3 github-from-package: 0.0.0 minimist: 1.2.7 @@ -11805,12 +11736,6 @@ packages: read: 2.1.0 dev: true - /prop@0.1.1: - resolution: {integrity: sha512-hf5DdgiPkcoVxBfuSknP918U0lDC+7lArIjIB2U4Gh79p1Xtc0JP6W5DW3c0wC0x9/A6CsAISh3202I1GlMgkw==} - dependencies: - dotty: 0.0.1 - dev: false - /property-information@6.2.0: resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==} @@ -14261,10 +14186,6 @@ packages: engines: {node: '>= 8'} dev: true - /web-tree-sitter@0.20.8: - resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==} - dev: false - /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -14738,19 +14659,6 @@ packages: yargs-parser: 21.1.1 dev: true - /yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} - engines: {node: '>=12'} - dependencies: - cliui: 8.0.1 - escalade: 3.1.1 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - dev: false - /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} @@ -14763,4 +14671,4 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} /zwitch@2.0.4: - resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} + resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} \ No newline at end of file From 733d6ec67369985a994e41ef7c384af05b032053 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 16 May 2024 14:12:11 +0200 Subject: [PATCH 08/47] pnpm i --- pnpm-lock.yaml | 133 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 127 insertions(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index de4f9185..e3395c25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -251,6 +251,31 @@ importers: packages/embed: {} + packages/haskell: + dependencies: + '@hpcc-js/wasm': + specifier: ^2.15.3 + version: 2.16.2 + jgf-dot: + specifier: ^1.1.1 + version: 1.1.1 + web-tree-sitter: + specifier: ^0.20.8 + version: 0.20.8 + devDependencies: + tree-sitter: + specifier: ^0.20.6 + version: 0.20.6 + tree-sitter-cli: + specifier: ^0.20.8 + version: 0.20.8 + tree-sitter-javascript: + specifier: ^0.20.1 + version: 0.20.4 + vite: + specifier: ^5.0.8 + version: 5.2.2(@types/node@20.10.6) + packages/hydra: dependencies: '@strudel/core': @@ -3034,6 +3059,13 @@ packages: react: 18.2.0 dev: false + /@hpcc-js/wasm@2.16.2: + resolution: {integrity: sha512-THiidUMYR8/cIfFT3MVcWuRE7bQKh295nrFBxGvUNc4Nq8e2uU1LtiplHs7AUkJ0GxgvZoR+8TQ1/E3Qb/uE2g==} + hasBin: true + dependencies: + yargs: 17.7.2 + dev: false + /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} engines: {node: '>=10.10.0'} @@ -6227,7 +6259,6 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - dev: true /clone-buffer@1.0.0: resolution: {integrity: sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==} @@ -6945,6 +6976,10 @@ packages: engines: {node: '>=12'} dev: true + /dotty@0.0.1: + resolution: {integrity: sha512-eDT0hfJEnQbGaZcTuCfj2igPkQ7qa/n9K2pGGDxhEqKhARLq+xE1TonvpOPHq+7KeG+D6A/V8BwCcsdPom2TQg==} + dev: false + /dset@3.1.3: resolution: {integrity: sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==} engines: {node: '>=4'} @@ -7866,6 +7901,10 @@ packages: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} dev: true + /gather-stream@1.0.0: + resolution: {integrity: sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==} + dev: false + /gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -8203,6 +8242,33 @@ packages: /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + /graphlib-dot@0.6.4: + resolution: {integrity: sha512-rdhDTu0mBlloTpFMfkQq+e3y4yL22OqP5MhQbkw6QUURqa+4YLgv3XZy2fA64wdEcJNZ+waI76URemVgdFtzng==} + dependencies: + graphlib: 2.1.8 + lodash: 4.17.21 + dev: false + + /graphlib-json-graph@1.0.0: + resolution: {integrity: sha512-sJsFuthZnSL5knaDDZhDx8fg1Zy5t/7ZqVHiytoeSzezGhMoSFD3T3K5YQakKFEyXtYjOzbnvsyr2qo+6/qq/Q==} + dependencies: + graphlib: 1.0.7 + par: 0.3.0 + prop: 0.1.1 + dev: false + + /graphlib@1.0.7: + resolution: {integrity: sha512-jNb7RbqTIRyZRmcVCxGefOlGWjNdbjcT2tFj36zhnRa8yhAlOvydh9nBixfLQIqSU+DwCx47tg3ysw8NIYhpsA==} + dependencies: + lodash: 3.10.1 + dev: false + + /graphlib@2.1.8: + resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==} + dependencies: + lodash: 4.17.21 + dev: false + /gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -9102,6 +9168,15 @@ packages: supports-color: 7.2.0 dev: true + /jgf-dot@1.1.1: + resolution: {integrity: sha512-/aw9bwVfn67A+lvjxtbocBuhB2rNdL5UY5rlHhKVh9ValvVJETU5lQ0jitDxiIjIPAEeuR4B1aFNA7E3wKNV1A==} + hasBin: true + dependencies: + graphlib-dot: 0.6.4 + graphlib-json-graph: 1.0.0 + read-file-stdin: 0.2.1 + dev: false + /jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true @@ -9558,9 +9633,12 @@ packages: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} dev: true + /lodash@3.10.1: + resolution: {integrity: sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==} + dev: false + /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - dev: true /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} @@ -10582,6 +10660,10 @@ packages: thenify-all: 1.6.0 dev: false + /nan@2.19.0: + resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==} + dev: true + /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -11266,6 +11348,11 @@ packages: - supports-color dev: true + /par@0.3.0: + resolution: {integrity: sha512-6V910zFAoHnxjX6ILkwbQcpIkD3KI2gBAPfCtZQNaJTvTxgIoKXSwDQIE3ty0zbOGdBXHRnl6rd66a5jj12pfw==} + engines: {node: '>=0.6'} + dev: false + /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -11736,6 +11823,12 @@ packages: read: 2.1.0 dev: true + /prop@0.1.1: + resolution: {integrity: sha512-hf5DdgiPkcoVxBfuSknP918U0lDC+7lArIjIB2U4Gh79p1Xtc0JP6W5DW3c0wC0x9/A6CsAISh3202I1GlMgkw==} + dependencies: + dotty: 0.0.1 + dev: false + /property-information@6.2.0: resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==} @@ -11867,6 +11960,12 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dev: true + /read-file-stdin@0.2.1: + resolution: {integrity: sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==} + dependencies: + gather-stream: 1.0.0 + dev: false + /read-package-json-fast@3.0.2: resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -13392,6 +13491,27 @@ packages: punycode: 2.3.1 dev: true + /tree-sitter-cli@0.20.8: + resolution: {integrity: sha512-XjTcS3wdTy/2cc/ptMLc/WRyOLECRYcMTrSWyhZnj1oGSOWbHLTklgsgRICU3cPfb0vy+oZCC33M43u6R1HSCA==} + hasBin: true + requiresBuild: true + dev: true + + /tree-sitter-javascript@0.20.4: + resolution: {integrity: sha512-7IUgGkZQROI7MmX2ErKhE3YP4+rM2qwBy5JeukE7fJQMEYP9nHpxvuQpa+eOX+hE1im2pWVc1yDCfVKKCBtxww==} + requiresBuild: true + dependencies: + nan: 2.19.0 + dev: true + + /tree-sitter@0.20.6: + resolution: {integrity: sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==} + requiresBuild: true + dependencies: + nan: 2.19.0 + prebuild-install: 7.1.1 + dev: true + /trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} @@ -14186,6 +14306,10 @@ packages: engines: {node: '>= 8'} dev: true + /web-tree-sitter@0.20.8: + resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==} + dev: false + /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -14494,7 +14618,6 @@ packages: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - dev: true /wrap-ansi@8.1.0: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} @@ -14586,7 +14709,6 @@ packages: /y18n@5.0.8: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} - dev: true /yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} @@ -14657,7 +14779,6 @@ packages: string-width: 4.2.3 y18n: 5.0.8 yargs-parser: 21.1.1 - dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} @@ -14671,4 +14792,4 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} /zwitch@2.0.4: - resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} \ No newline at end of file + resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} From 2aac085bb8ac623e3dd91a36feb596f54b73cab7 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 16 May 2024 14:12:30 +0200 Subject: [PATCH 09/47] lint fix --- packages/haskell/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/haskell/index.html b/packages/haskell/index.html index 9883b1b9..c371ec39 100644 --- a/packages/haskell/index.html +++ b/packages/haskell/index.html @@ -1,4 +1,4 @@ - + From 09e455e17e2972239afd0f82e3d09c24fb59ede4 Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 16 May 2024 14:30:00 +0200 Subject: [PATCH 10/47] move haskell-tree-sitter-playground --- packages/haskell/.gitignore | 2 - packages/haskell/README.md | 28 ++------ packages/haskell/graph.mjs | 43 +++++++++++ packages/haskell/hs2js.mjs | 131 ++++++++++++++++++++++++++++++++++ packages/haskell/index.html | 23 ++++-- packages/haskell/main.js | 120 ++++++++++++++++++++----------- packages/haskell/package.json | 38 +++++++--- packages/haskell/parser.mjs | 22 ++++++ pnpm-lock.yaml | 58 +++++++++------ 9 files changed, 362 insertions(+), 103 deletions(-) create mode 100644 packages/haskell/graph.mjs create mode 100644 packages/haskell/hs2js.mjs create mode 100644 packages/haskell/parser.mjs diff --git a/packages/haskell/.gitignore b/packages/haskell/.gitignore index 75d4123f..ce99c129 100644 --- a/packages/haskell/.gitignore +++ b/packages/haskell/.gitignore @@ -25,5 +25,3 @@ dist-ssr public/tree-sitter.wasm public/tree-sitter-haskell.wasm -public/tree-sitter-haskell_mine.wasm -public/tree-sitter-haskell_theirs.wasm \ No newline at end of file diff --git a/packages/haskell/README.md b/packages/haskell/README.md index 0143b93e..24f3efc3 100644 --- a/packages/haskell/README.md +++ b/packages/haskell/README.md @@ -1,31 +1,11 @@ -# @strudel/haskell +# @strudel/tidal This is an experiment in implementing tree-sitter for parsing haskell. -So far, I have just set up a vite project that imports and inits `web-tree-sitter`, which works after - -- -- - -Running: - ```sh -cd haskell && pnpm i +pnpm i +cd haskell pnpm dev ``` -will start the vite dev server, loading tree sitter on `http://localhost:5174/`. - -The next step is be to generate `tree-sitter-haskell.wasm` file following . - -I've tried to generate it using but it failed, due to some versioning conflicts involving node / v8 / node-gyp. - -It seems a lot of work has gone into this package in , without a new npm package version being released, which is why I've written this comment: . - -So either someone authorized releases a new version of the package or we might need to pull the changes and try to build it from the tree-sitter master branch. - -## Update 1 - -I've managed to make it work by using [this tree-sitter-haskell.wasm](https://github.com/tree-sitter/tree-sitter-haskell/blob/master/tree-sitter-haskell.wasm), instead of using the version on npm! Make sure both `tree-sitter.wasm` and `tree-sitter-haskell.wasm` are in the public dir, then run `pnpm dev`. The console should log a tree sitter AST string. - -Next step: understand how the ast works to then transform it into JS function calls! +This \ No newline at end of file diff --git a/packages/haskell/graph.mjs b/packages/haskell/graph.mjs new file mode 100644 index 00000000..bac3d135 --- /dev/null +++ b/packages/haskell/graph.mjs @@ -0,0 +1,43 @@ +import { Graphviz } from '@hpcc-js/wasm'; +import toDot from 'jgf-dot'; + +const graphvizLoaded = Graphviz.load(); + +function walk(node, branch = [0], parent) { + let nodes = []; + let edges = []; + const color = 'white'; + const current = { + id: branch.join('-'), + color, + fontcolor: color, + label: node.type.replace('\\', 'lambda'), // backslash kills graphviz.. + }; + nodes.push(current); + parent && edges.push({ source: parent.id, target: current.id, color }); + if (node.children.length) { + node.children.forEach((child, j) => { + const { nodes: childNodes, edges: childEdges } = walk(child, branch.concat([j]), current); + nodes = nodes.concat(childNodes || []); + edges = edges.concat(childEdges || []); + }); + } + return { nodes, edges }; +} + +export async function renderGraph(tree, container) { + const { nodes, edges } = walk(tree.rootNode); + const graphviz = await graphvizLoaded; + let dot = toDot({ + graph: { + nodes, + edges, + }, + }); + dot = dot.split('\n'); + dot.splice(1, 0, 'bgcolor="transparent"'); + dot.splice(1, 0, 'color="white"'); + dot = dot.join('\n'); + const svg = await graphviz.layout(dot, 'svg', 'dot', {}); + container.innerHTML = svg; +} diff --git a/packages/haskell/hs2js.mjs b/packages/haskell/hs2js.mjs new file mode 100644 index 00000000..3a507112 --- /dev/null +++ b/packages/haskell/hs2js.mjs @@ -0,0 +1,131 @@ +function runApply(node, scope, ops) { + if (node.children.length !== 2) + throw new Error(`expected 2 children for node type apply, got ${node.children.length}`); + const [fn, arg] = node.children.map((child) => run(child, scope, ops)); + if (typeof fn !== 'function') { + throw new Error(`${node.children[0].text} is not a function`); + } + // only works if fn is curried! + return fn(arg); +} + +function runInfix(left, symbol, right, ops) { + const customOp = ops[symbol]; + if (customOp) { + return customOp(left, right); + } + switch (symbol) { + case '+': + return left + right; + case '-': + return left - right; + case '*': + return left * right; + case '/': + return left / right; + case '$': + return left(right); + case '&': + console.log('right', right); + return right(left); + case '.': + return (x) => left(right(x)); + default: + throw new Error('unexpected infix operator ' + symbol); + } +} + +function curry(patterns, body, scope, ops) { + const [variable, ...rest] = patterns; + return (arg) => { + let _scope = { ...scope, [variable.text]: arg }; + if (patterns.length === 1) { + const result = run(body, _scope, ops); + return result; + } + return curry(rest, body, _scope, ops); + }; +} + +export function run(node, scope, ops = {}) { + let runInScope = (node, scp = scope) => run(node, scp, ops); + //console.log("node", node.type, node.text); + switch (node.type) { + case 'ERROR': + throw new Error(`invalid syntax: "${node.text}"`); + case 'declarations': + let result; + node.children.forEach((declaration) => { + result = runInScope(declaration); + }); + return result; + case 'integer': + return Number(node.text); + case 'float': + return Number(node.text); + case 'string': + const str = node.text.slice(1, -1); + return String(str); + case 'lambda': + const [_, lpatterns, __, lbody] = node.children; + return curry(lpatterns.children, lbody, scope, ops); + case 'function': + const [fvariable, fpatterns, fbody] = node.children; + scope[fvariable.text] = curry(fpatterns.children, fbody, scope, ops); + return scope[fvariable.text]; + case 'list': { + return node.children + .filter((_, i) => i % 2 === 1) // elements are at odd indices + .map((node) => runInScope(node)); + } + case 'match': + if (node.children[0].text !== '=' || node.children.length !== 2) { + throw new Error('match node so far only support simple assignments'); + } + return runInScope(node.children[1]); + case 'bind': + if (node.children.length !== 2) throw new Error('expected 2 children for node type bind'); + if (node.children[0].type !== 'variable') throw new Error('expected variable as first child of bind node'); + if (node.children[1].type !== 'match') throw new Error('expected match as first child of bind node'); + const [bvariable, bmatch] = node.children; + const value = runInScope(bmatch); + scope[bvariable.text] = value; + return value; + case 'variable': + return scope[node.text]; + case 'infix': { + const [a, op, b] = node.children; + const symbol = op.text; + const [left, right] = [runInScope(a), runInScope(b)]; + return runInfix(left, symbol, right, ops); + } + case 'apply': + return runApply(node, scope, ops); + case 'left_section': { + const [_, b, op] = node.children; + const right = runInScope(b); + return (left) => runInfix(left, op.text, right, ops); + } + case 'right_section': { + const [_, op, b] = node.children; + const right = runInScope(b); + return (left) => runInfix(left, op.text, right, ops); + } + case 'parens': + if (node.children.length !== 3) throw new Error('expected 3 children for node type parens'); + return runInScope(node.children[1]); + default: + if (node.children.length === 0) { + throw new Error('unhandled leaf type ' + node.type); + } + if (node.children.length > 1) { + throw new Error('unhandled branch type ' + node.type); + } + return runInScope(node.children[0]); + } +} + +export async function evaluate(haskellCode, scope = globalThis, ops) { + const ast = await parse(haskellCode); + return run(ast.rootNode, scope, ops); +} diff --git a/packages/haskell/index.html b/packages/haskell/index.html index c371ec39..532bce3d 100644 --- a/packages/haskell/index.html +++ b/packages/haskell/index.html @@ -2,13 +2,28 @@ - Tree sitter test + - - -
+ + + 

+    

     
   
 
diff --git a/packages/haskell/main.js b/packages/haskell/main.js
index df11110a..bd9c2702 100644
--- a/packages/haskell/main.js
+++ b/packages/haskell/main.js
@@ -1,51 +1,89 @@
-import Parser from 'web-tree-sitter';
-import toDot from 'jgf-dot';
-import { Graphviz } from '@hpcc-js/wasm';
+import { run } from './hs2js.mjs';
+import { renderGraph } from './graph.mjs';
+import { parse } from './parser.mjs';
+import { initStrudel, reify, late } from '@strudel/web';
+initStrudel({
+  prebake: () => samples('github:tidalcycles/dirt-samples'),
+});
 
-const graphvizLoaded = Graphviz.load();
-const parserLoaded = loadParser();
 const graphContainer = document.getElementById('graph');
 
 const textarea = document.getElementById('code');
-textarea.value = 'd1 $ s "hh(3,8)"';
-textarea.addEventListener('input', (e) => renderGraph(e.target.value, graphContainer));
-renderGraph(textarea.value, graphContainer);
+if (window.location.hash) {
+  textarea.value = atob(window.location.hash.slice(1));
+} else {
+  textarea.value = 'd1 $ s "jvbass(3,8)"';
+}
+textarea.addEventListener('input', (e) => {
+  window.location.hash = btoa(e.target.value);
+  update();
+});
+update();
 
-function walk(node, branch = [0], parent) {
-  let nodes = [];
-  let edges = [];
-  const current = { id: branch.join('-'), label: node.type };
-  nodes.push(current);
-  parent && edges.push({ source: parent.id, target: current.id });
-  if (node.children.length) {
-    node.children.forEach((child, j) => {
-      const { nodes: childNodes, edges: childEdges } = walk(child, branch.concat([j]), current);
-      nodes = nodes.concat(childNodes || []);
-      edges = edges.concat(childEdges || []);
+function getInfixOperators() {
+  let operators = {
+    '>': 'set',
+    '#': 'set',
+    '+': 'add',
+    '-': 'sub',
+    '*': 'mul',
+    '/': 'div',
+  };
+  let alignments = {
+    in: (s) => '|' + s,
+    out: (s) => s + '|',
+    mix: (s) => '|' + s + '|',
+  };
+  let ops = {};
+  Object.entries(operators).forEach(([o, name]) => {
+    // operator without alignment
+    ops[o] = (l, r) => reify(l)[name](reify(r));
+    Object.entries(alignments).forEach(([a, getSymbol]) => {
+      // get symbol with alignment
+      let symbol = getSymbol(o);
+      ops[symbol] = (l, r) => reify(l)[name][a](reify(r));
     });
-  }
-  return { nodes, edges };
-}
-
-async function renderGraph(code, container) {
-  const parser = await parserLoaded;
-  const tree = parser.parse(code);
-  const { nodes, edges } = walk(tree.rootNode);
-  const graphviz = await graphvizLoaded;
-  const dot = toDot({
-    graph: {
-      nodes,
-      edges,
-    },
   });
-  const svg = await graphviz.layout(dot, 'svg', 'dot');
-  container.innerHTML = svg;
+  ops['~>'] = (l, r) => reify(l).late(reify(r));
+  ops['<~'] = (l, r) => reify(l).early(reify(r));
+  ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
+  return ops;
 }
+const ops = getInfixOperators();
 
-async function loadParser() {
-  await Parser.init();
-  const parser = new Parser();
-  const Lang = await Parser.Language.load('tree-sitter-haskell.wasm');
-  parser.setLanguage(Lang);
-  return parser;
+async function update() {
+  let result, tree;
+  try {
+    tree = await parse(textarea.value);
+  } catch (err) {
+    console.warn('parse error');
+    console.error(err);
+  }
+  console.log('parsed tree');
+  console.log(tree.rootNode.toString());
+  try {
+    renderGraph(tree, graphContainer);
+  } catch (err) {
+    console.warn('could not render graph');
+    console.error(err);
+  }
+  try {
+    let patterns = {};
+    window.p = (name, pattern) => {
+      patterns[name] = pattern;
+    };
+    window.d1 = (pat) => window.p(1, pat);
+    window.d2 = (pat) => window.p(2, pat);
+    window.d3 = (pat) => window.p(3, pat);
+    window.rot = late;
+    result = run(tree.rootNode, window, ops);
+    if (Object.values(patterns).length) {
+      stack(...Object.values(patterns)).play();
+    }
+  } catch (err) {
+    console.warn('eval error');
+    console.error(err);
+    result = 'ERROR: ' + err.message;
+  }
+  document.getElementById('result').innerHTML = 'Result: ' + result;
 }
diff --git a/packages/haskell/package.json b/packages/haskell/package.json
index 46039e25..7d8b72e4 100644
--- a/packages/haskell/package.json
+++ b/packages/haskell/package.json
@@ -1,24 +1,42 @@
 {
-  "name": "haskell",
+  "name": "@strudel/tidal",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public",
-    "parse": "tree-sitter parse -D ./test.hs"
+    "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public && npm run build:parser",
+    "build:parser": "tree-sitter build-wasm node_modules/tree-sitter-haskell && mv tree-sitter-haskell.wasm public"
   },
-  "devDependencies": {
-    "tree-sitter": "^0.20.6",
-    "tree-sitter-cli": "^0.20.8",
-    "tree-sitter-javascript": "^0.20.1",
-    "vite": "^5.0.8"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
   },
+  "keywords": [
+    "titdalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos ",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@hpcc-js/wasm": "^2.15.3",
     "jgf-dot": "^1.1.1",
-    "web-tree-sitter": "^0.20.8"
+    "web-tree-sitter": "^0.22.6",
+    "tree-sitter-haskell": "^0.21.0",
+    "@strudel/web": "workspace:*"
+  },
+  "devDependencies": {
+    "tree-sitter": "^0.21.1",
+    "tree-sitter-cli": "^0.20.8",
+    "vite": "^5.0.8"
   }
 }
diff --git a/packages/haskell/parser.mjs b/packages/haskell/parser.mjs
new file mode 100644
index 00000000..1b1f8a03
--- /dev/null
+++ b/packages/haskell/parser.mjs
@@ -0,0 +1,22 @@
+import Parser from 'web-tree-sitter';
+
+const base = import.meta.env.BASE_URL;
+
+async function loadParser() {
+  await Parser.init({
+    locateFile(scriptName, scriptDirectory) {
+      return `${base}${scriptName}`;
+    },
+  });
+  const parser = new Parser();
+  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
+  parser.setLanguage(Lang);
+  return parser;
+}
+
+let parserLoaded = loadParser();
+export async function parse(code) {
+  const parser = await parserLoaded;
+  // for some reason, the parser doesn't like new lines..
+  return parser.parse(code.replaceAll('\n\n', '~~~~').replaceAll('\n', '').replaceAll('~~~~', '\n'));
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e3395c25..76947b5a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -256,22 +256,25 @@ importers:
       '@hpcc-js/wasm':
         specifier: ^2.15.3
         version: 2.16.2
+      '@strudel/web':
+        specifier: workspace:*
+        version: link:../web
       jgf-dot:
         specifier: ^1.1.1
         version: 1.1.1
+      tree-sitter-haskell:
+        specifier: ^0.21.0
+        version: 0.21.0(tree-sitter@0.21.1)
       web-tree-sitter:
-        specifier: ^0.20.8
-        version: 0.20.8
+        specifier: ^0.22.6
+        version: 0.22.6
     devDependencies:
       tree-sitter:
-        specifier: ^0.20.6
-        version: 0.20.6
+        specifier: ^0.21.1
+        version: 0.21.1
       tree-sitter-cli:
         specifier: ^0.20.8
         version: 0.20.8
-      tree-sitter-javascript:
-        specifier: ^0.20.1
-        version: 0.20.4
       vite:
         specifier: ^5.0.8
         version: 5.2.2(@types/node@20.10.6)
@@ -10660,10 +10663,6 @@ packages:
       thenify-all: 1.6.0
     dev: false
 
-  /nan@2.19.0:
-    resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==}
-    dev: true
-
   /nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -10719,6 +10718,10 @@ packages:
       semver: 7.5.4
     dev: true
 
+  /node-addon-api@8.0.0:
+    resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
+    engines: {node: ^18 || ^20 || >= 21}
+
   /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
@@ -10762,6 +10765,10 @@ packages:
     engines: {node: '>= 0.6.0'}
     dev: false
 
+  /node-gyp-build@4.8.1:
+    resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==}
+    hasBin: true
+
   /node-gyp@10.0.1:
     resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==}
     engines: {node: ^16.14.0 || >=18.0.0}
@@ -13497,20 +13504,27 @@ packages:
     requiresBuild: true
     dev: true
 
-  /tree-sitter-javascript@0.20.4:
-    resolution: {integrity: sha512-7IUgGkZQROI7MmX2ErKhE3YP4+rM2qwBy5JeukE7fJQMEYP9nHpxvuQpa+eOX+hE1im2pWVc1yDCfVKKCBtxww==}
+  /tree-sitter-haskell@0.21.0(tree-sitter@0.21.1):
+    resolution: {integrity: sha512-b2RLegPHuYPh7nJ3YKWgkWnFYxmYlQDE8TDJuNH+iuNuBcCMYyaA9JlJlMHfCvf7DmJNPtqqbO9Kh9NXEmbatQ==}
     requiresBuild: true
+    peerDependencies:
+      tree-sitter: ^0.21.0
+      tree_sitter: '*'
+    peerDependenciesMeta:
+      tree_sitter:
+        optional: true
     dependencies:
-      nan: 2.19.0
-    dev: true
+      node-addon-api: 8.0.0
+      node-gyp-build: 4.8.1
+      tree-sitter: 0.21.1
+    dev: false
 
-  /tree-sitter@0.20.6:
-    resolution: {integrity: sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==}
+  /tree-sitter@0.21.1:
+    resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
     requiresBuild: true
     dependencies:
-      nan: 2.19.0
-      prebuild-install: 7.1.1
-    dev: true
+      node-addon-api: 8.0.0
+      node-gyp-build: 4.8.1
 
   /trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
@@ -14306,8 +14320,8 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /web-tree-sitter@0.20.8:
-    resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
+  /web-tree-sitter@0.22.6:
+    resolution: {integrity: sha512-hS87TH71Zd6mGAmYCvlgxeGDjqd9GTeqXNqTT+u0Gs51uIozNIaaq/kUAbV/Zf56jb2ZOyG8BxZs2GG9wbLi6Q==}
     dev: false
 
   /webidl-conversions@3.0.1:

From eba7dec1a516d8ee3149ec911917d398b8a7267e Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Thu, 16 May 2024 14:31:00 +0200
Subject: [PATCH 11/47] rename haskell -> tidal

---
 packages/{haskell => tidal}/.gitignore       |  0
 packages/{haskell => tidal}/README.md        |  0
 packages/{haskell => tidal}/graph.mjs        |  0
 packages/{haskell => tidal}/hs2js.mjs        |  0
 packages/{haskell => tidal}/index.html       |  0
 packages/{haskell => tidal}/main.js          |  0
 packages/{haskell => tidal}/package.json     |  0
 packages/{haskell => tidal}/parser.mjs       |  0
 packages/{haskell => tidal}/public/README.md |  0
 pnpm-lock.yaml                               | 56 ++++++++++----------
 10 files changed, 28 insertions(+), 28 deletions(-)
 rename packages/{haskell => tidal}/.gitignore (100%)
 rename packages/{haskell => tidal}/README.md (100%)
 rename packages/{haskell => tidal}/graph.mjs (100%)
 rename packages/{haskell => tidal}/hs2js.mjs (100%)
 rename packages/{haskell => tidal}/index.html (100%)
 rename packages/{haskell => tidal}/main.js (100%)
 rename packages/{haskell => tidal}/package.json (100%)
 rename packages/{haskell => tidal}/parser.mjs (100%)
 rename packages/{haskell => tidal}/public/README.md (100%)

diff --git a/packages/haskell/.gitignore b/packages/tidal/.gitignore
similarity index 100%
rename from packages/haskell/.gitignore
rename to packages/tidal/.gitignore
diff --git a/packages/haskell/README.md b/packages/tidal/README.md
similarity index 100%
rename from packages/haskell/README.md
rename to packages/tidal/README.md
diff --git a/packages/haskell/graph.mjs b/packages/tidal/graph.mjs
similarity index 100%
rename from packages/haskell/graph.mjs
rename to packages/tidal/graph.mjs
diff --git a/packages/haskell/hs2js.mjs b/packages/tidal/hs2js.mjs
similarity index 100%
rename from packages/haskell/hs2js.mjs
rename to packages/tidal/hs2js.mjs
diff --git a/packages/haskell/index.html b/packages/tidal/index.html
similarity index 100%
rename from packages/haskell/index.html
rename to packages/tidal/index.html
diff --git a/packages/haskell/main.js b/packages/tidal/main.js
similarity index 100%
rename from packages/haskell/main.js
rename to packages/tidal/main.js
diff --git a/packages/haskell/package.json b/packages/tidal/package.json
similarity index 100%
rename from packages/haskell/package.json
rename to packages/tidal/package.json
diff --git a/packages/haskell/parser.mjs b/packages/tidal/parser.mjs
similarity index 100%
rename from packages/haskell/parser.mjs
rename to packages/tidal/parser.mjs
diff --git a/packages/haskell/public/README.md b/packages/tidal/public/README.md
similarity index 100%
rename from packages/haskell/public/README.md
rename to packages/tidal/public/README.md
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 76947b5a..53cf7207 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -251,34 +251,6 @@ importers:
 
   packages/embed: {}
 
-  packages/haskell:
-    dependencies:
-      '@hpcc-js/wasm':
-        specifier: ^2.15.3
-        version: 2.16.2
-      '@strudel/web':
-        specifier: workspace:*
-        version: link:../web
-      jgf-dot:
-        specifier: ^1.1.1
-        version: 1.1.1
-      tree-sitter-haskell:
-        specifier: ^0.21.0
-        version: 0.21.0(tree-sitter@0.21.1)
-      web-tree-sitter:
-        specifier: ^0.22.6
-        version: 0.22.6
-    devDependencies:
-      tree-sitter:
-        specifier: ^0.21.1
-        version: 0.21.1
-      tree-sitter-cli:
-        specifier: ^0.20.8
-        version: 0.20.8
-      vite:
-        specifier: ^5.0.8
-        version: 5.2.2(@types/node@20.10.6)
-
   packages/hydra:
     dependencies:
       '@strudel/core':
@@ -437,6 +409,34 @@ importers:
         specifier: ^5.0.10
         version: 5.0.10
 
+  packages/tidal:
+    dependencies:
+      '@hpcc-js/wasm':
+        specifier: ^2.15.3
+        version: 2.16.2
+      '@strudel/web':
+        specifier: workspace:*
+        version: link:../web
+      jgf-dot:
+        specifier: ^1.1.1
+        version: 1.1.1
+      tree-sitter-haskell:
+        specifier: ^0.21.0
+        version: 0.21.0(tree-sitter@0.21.1)
+      web-tree-sitter:
+        specifier: ^0.22.6
+        version: 0.22.6
+    devDependencies:
+      tree-sitter:
+        specifier: ^0.21.1
+        version: 0.21.1
+      tree-sitter-cli:
+        specifier: ^0.20.8
+        version: 0.20.8
+      vite:
+        specifier: ^5.0.8
+        version: 5.2.2(@types/node@20.10.6)
+
   packages/tonal:
     dependencies:
       '@strudel/core':

From 29598d1744f7dd06f5994af93c9e1658be8e4ab9 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Thu, 16 May 2024 14:32:45 +0200
Subject: [PATCH 12/47] fix: lint

---
 .eslintignore            | 3 ++-
 packages/tidal/hs2js.mjs | 1 -
 packages/tidal/main.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 7d807b65..a16bd3cd 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -21,4 +21,5 @@ vite.config.js
 /src-tauri/target/**/*
 reverbGen.mjs
 hydra.mjs
-jsdoc-synonyms.js
\ No newline at end of file
+jsdoc-synonyms.js
+packages/tidal/hs2js.mjs
\ No newline at end of file
diff --git a/packages/tidal/hs2js.mjs b/packages/tidal/hs2js.mjs
index 3a507112..733b7aeb 100644
--- a/packages/tidal/hs2js.mjs
+++ b/packages/tidal/hs2js.mjs
@@ -26,7 +26,6 @@ function runInfix(left, symbol, right, ops) {
     case '$':
       return left(right);
     case '&':
-      console.log('right', right);
       return right(left);
     case '.':
       return (x) => left(right(x));
diff --git a/packages/tidal/main.js b/packages/tidal/main.js
index bd9c2702..b1d40198 100644
--- a/packages/tidal/main.js
+++ b/packages/tidal/main.js
@@ -1,7 +1,7 @@
 import { run } from './hs2js.mjs';
 import { renderGraph } from './graph.mjs';
 import { parse } from './parser.mjs';
-import { initStrudel, reify, late } from '@strudel/web';
+import { initStrudel, reify, late, samples, stack } from '@strudel/web';
 initStrudel({
   prebake: () => samples('github:tidalcycles/dirt-samples'),
 });

From ed506cabb5414b74c4924464afadffb073d43759 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 09:09:31 +0200
Subject: [PATCH 13/47] hs2js test

---
 examples/buildless/hs2js.html |  8 ++++++++
 pnpm-lock.yaml                | 13 +++++++++++++
 website/package.json          |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 examples/buildless/hs2js.html

diff --git a/examples/buildless/hs2js.html b/examples/buildless/hs2js.html
new file mode 100644
index 00000000..c15e6e25
--- /dev/null
+++ b/examples/buildless/hs2js.html
@@ -0,0 +1,8 @@
+
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 53cf7207..577954cb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -657,6 +657,9 @@ importers:
       date-fns:
         specifier: ^3.2.0
         version: 3.2.0
+      hs2js:
+        specifier: ^0.0.2
+        version: 0.0.2
       nanoid:
         specifier: ^5.0.4
         version: 5.0.4
@@ -8543,6 +8546,12 @@ packages:
       lru-cache: 10.1.0
     dev: true
 
+  /hs2js@0.0.2:
+    resolution: {integrity: sha512-ABgqMkNP3aTDm+zi8nmyEKkqIeL74T921cDb9fVbqozDnHE9SzvED995aNJqZt+wY+1roTcN29zgsg3RWVSmBw==}
+    dependencies:
+      web-tree-sitter: 0.20.8
+    dev: false
+
   /html-escaper@3.0.3:
     resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==}
 
@@ -14320,6 +14329,10 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
+  /web-tree-sitter@0.20.8:
+    resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
+    dev: false
+
   /web-tree-sitter@0.22.6:
     resolution: {integrity: sha512-hS87TH71Zd6mGAmYCvlgxeGDjqd9GTeqXNqTT+u0Gs51uIozNIaaq/kUAbV/Zf56jb2ZOyG8BxZs2GG9wbLi6Q==}
     dev: false
diff --git a/website/package.json b/website/package.json
index bf56d983..5065c106 100644
--- a/website/package.json
+++ b/website/package.json
@@ -49,6 +49,7 @@
     "astro": "^4.0.8",
     "claviature": "^0.1.0",
     "date-fns": "^3.2.0",
+    "hs2js": "^0.0.2",
     "nanoid": "^5.0.4",
     "nanostores": "^0.9.5",
     "react": "^18.2.0",

From c232fb7dd5cb2a592265f60463c244c56ae4e46a Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 10:00:00 +0200
Subject: [PATCH 14/47] move hs2js package here + improve readme

---
 examples/buildless/hs2js.html  |   7 +-
 packages/hs2js/LICENSE         | 661 +++++++++++++++++++++++++++++++++
 packages/hs2js/README.md       |  49 +++
 packages/hs2js/package.json    |  33 ++
 packages/hs2js/pnpm-lock.yaml  | 520 ++++++++++++++++++++++++++
 packages/hs2js/src/hs2js.mjs   | 139 +++++++
 packages/hs2js/src/index.mjs   |   2 +
 packages/hs2js/src/parser.mjs  |  37 ++
 packages/hs2js/vite.config.mjs |  20 +
 packages/tidal/main.js         |   3 +-
 packages/tidal/package.json    |  10 +-
 pnpm-lock.yaml                 |  43 +--
 12 files changed, 1489 insertions(+), 35 deletions(-)
 create mode 100644 packages/hs2js/LICENSE
 create mode 100644 packages/hs2js/README.md
 create mode 100644 packages/hs2js/package.json
 create mode 100644 packages/hs2js/pnpm-lock.yaml
 create mode 100644 packages/hs2js/src/hs2js.mjs
 create mode 100644 packages/hs2js/src/index.mjs
 create mode 100644 packages/hs2js/src/parser.mjs
 create mode 100644 packages/hs2js/vite.config.mjs

diff --git a/examples/buildless/hs2js.html b/examples/buildless/hs2js.html
index c15e6e25..5ffb6cf0 100644
--- a/examples/buildless/hs2js.html
+++ b/examples/buildless/hs2js.html
@@ -1,8 +1,9 @@
 
+
 
diff --git a/packages/hs2js/LICENSE b/packages/hs2js/LICENSE
new file mode 100644
index 00000000..0ad25db4
--- /dev/null
+++ b/packages/hs2js/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            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 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
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+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.
+
+  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.
+
+  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.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+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.
+
+  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
+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.
+
+  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
+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
+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
+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
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    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 .
+
+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.
+
+  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
+.
diff --git a/packages/hs2js/README.md b/packages/hs2js/README.md
new file mode 100644
index 00000000..f4ca3ed5
--- /dev/null
+++ b/packages/hs2js/README.md
@@ -0,0 +1,49 @@
+# hs2js
+
+Experimental haskell in javascript interpreter.
+
+## Usage
+
+### Via Script Tag
+
+You can load the library directly from a script tag via unpkg:
+
+```html
+
+
+
+```
+
+### Via npm
+
+You need to add `postinstall` to your `package.json` script to copy the parser to your `public` folder:
+
+```json
+{
+  "scripts": {
+    "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
+  }
+}
+```
+
+Depending on your setup, replace `public` with the folder that will serve your assets to `/`. Then install the package:
+
+```sh
+npm i hs2js
+```
+
+and use it:
+
+```js
+import * as hs2js from 'hs2js';
+hs2js.loadParser();
+document.getElementById('hello').addEventListener('click', () => {
+  hs2js.evaluate('alert "hello from haskell!"');
+});
+```
diff --git a/packages/hs2js/package.json b/packages/hs2js/package.json
new file mode 100644
index 00000000..d0cd0f62
--- /dev/null
+++ b/packages/hs2js/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "hs2js",
+  "version": "0.0.4",
+  "description": "Experimental Haskell in JavaScript interpreter",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "scripts": {
+    "build-wasm": "tree-sitter build-wasm node_modules/tree-sitter-haskell && mv tree-sitter-haskell.wasm ./dist/ && cp node_modules/web-tree-sitter/tree-sitter.wasm ./dist/",
+    "build": "vite build && npm run build-wasm",
+    "prepublishOnly": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/felixroos/hs2js.git"
+  },
+  "keywords": [
+    "haskell",
+    "javascript"
+  ],
+  "author": "Felix Roos ",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel/tree/main/packages/hs2js",
+  "dependencies": {
+    "web-tree-sitter": "^0.20.8"
+  },
+  "devDependencies": {
+    "vite": "^5.0.10",
+    "tree-sitter-haskell": "^0.21.0"
+  }
+}
diff --git a/packages/hs2js/pnpm-lock.yaml b/packages/hs2js/pnpm-lock.yaml
new file mode 100644
index 00000000..9043fd41
--- /dev/null
+++ b/packages/hs2js/pnpm-lock.yaml
@@ -0,0 +1,520 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+dependencies:
+  web-tree-sitter:
+    specifier: ^0.20.8
+    version: 0.20.8
+
+devDependencies:
+  tree-sitter-haskell:
+    specifier: ^0.21.0
+    version: 0.21.0(tree-sitter@0.21.1)
+  vite:
+    specifier: ^5.0.10
+    version: 5.2.11
+
+packages:
+
+  /@esbuild/aix-ppc64@0.20.2:
+    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm64@0.20.2:
+    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm@0.20.2:
+    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64@0.20.2:
+    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-arm64@0.20.2:
+    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-x64@0.20.2:
+    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-arm64@0.20.2:
+    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-x64@0.20.2:
+    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm64@0.20.2:
+    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm@0.20.2:
+    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.20.2:
+    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-loong64@0.20.2:
+    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-mips64el@0.20.2:
+    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ppc64@0.20.2:
+    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-riscv64@0.20.2:
+    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-s390x@0.20.2:
+    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-x64@0.20.2:
+    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/netbsd-x64@0.20.2:
+    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/openbsd-x64@0.20.2:
+    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/sunos-x64@0.20.2:
+    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-arm64@0.20.2:
+    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-ia32@0.20.2:
+    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-x64@0.20.2:
+    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-android-arm-eabi@4.17.2:
+    resolution: {integrity: sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-android-arm64@4.17.2:
+    resolution: {integrity: sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-arm64@4.17.2:
+    resolution: {integrity: sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-x64@4.17.2:
+    resolution: {integrity: sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.17.2:
+    resolution: {integrity: sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-musleabihf@4.17.2:
+    resolution: {integrity: sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-gnu@4.17.2:
+    resolution: {integrity: sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-musl@4.17.2:
+    resolution: {integrity: sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-powerpc64le-gnu@4.17.2:
+    resolution: {integrity: sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-riscv64-gnu@4.17.2:
+    resolution: {integrity: sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-s390x-gnu@4.17.2:
+    resolution: {integrity: sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-gnu@4.17.2:
+    resolution: {integrity: sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-musl@4.17.2:
+    resolution: {integrity: sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-arm64-msvc@4.17.2:
+    resolution: {integrity: sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-ia32-msvc@4.17.2:
+    resolution: {integrity: sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-x64-msvc@4.17.2:
+    resolution: {integrity: sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@types/estree@1.0.5:
+    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
+    dev: true
+
+  /esbuild@0.20.2:
+    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.20.2
+      '@esbuild/android-arm': 0.20.2
+      '@esbuild/android-arm64': 0.20.2
+      '@esbuild/android-x64': 0.20.2
+      '@esbuild/darwin-arm64': 0.20.2
+      '@esbuild/darwin-x64': 0.20.2
+      '@esbuild/freebsd-arm64': 0.20.2
+      '@esbuild/freebsd-x64': 0.20.2
+      '@esbuild/linux-arm': 0.20.2
+      '@esbuild/linux-arm64': 0.20.2
+      '@esbuild/linux-ia32': 0.20.2
+      '@esbuild/linux-loong64': 0.20.2
+      '@esbuild/linux-mips64el': 0.20.2
+      '@esbuild/linux-ppc64': 0.20.2
+      '@esbuild/linux-riscv64': 0.20.2
+      '@esbuild/linux-s390x': 0.20.2
+      '@esbuild/linux-x64': 0.20.2
+      '@esbuild/netbsd-x64': 0.20.2
+      '@esbuild/openbsd-x64': 0.20.2
+      '@esbuild/sunos-x64': 0.20.2
+      '@esbuild/win32-arm64': 0.20.2
+      '@esbuild/win32-ia32': 0.20.2
+      '@esbuild/win32-x64': 0.20.2
+    dev: true
+
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+    dev: true
+
+  /node-addon-api@8.0.0:
+    resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
+    engines: {node: ^18 || ^20 || >= 21}
+    dev: true
+
+  /node-gyp-build@4.8.1:
+    resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==}
+    hasBin: true
+    dev: true
+
+  /picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
+    dev: true
+
+  /postcss@8.4.38:
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.1
+      source-map-js: 1.2.0
+    dev: true
+
+  /rollup@4.17.2:
+    resolution: {integrity: sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+    dependencies:
+      '@types/estree': 1.0.5
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.17.2
+      '@rollup/rollup-android-arm64': 4.17.2
+      '@rollup/rollup-darwin-arm64': 4.17.2
+      '@rollup/rollup-darwin-x64': 4.17.2
+      '@rollup/rollup-linux-arm-gnueabihf': 4.17.2
+      '@rollup/rollup-linux-arm-musleabihf': 4.17.2
+      '@rollup/rollup-linux-arm64-gnu': 4.17.2
+      '@rollup/rollup-linux-arm64-musl': 4.17.2
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.17.2
+      '@rollup/rollup-linux-riscv64-gnu': 4.17.2
+      '@rollup/rollup-linux-s390x-gnu': 4.17.2
+      '@rollup/rollup-linux-x64-gnu': 4.17.2
+      '@rollup/rollup-linux-x64-musl': 4.17.2
+      '@rollup/rollup-win32-arm64-msvc': 4.17.2
+      '@rollup/rollup-win32-ia32-msvc': 4.17.2
+      '@rollup/rollup-win32-x64-msvc': 4.17.2
+      fsevents: 2.3.3
+    dev: true
+
+  /source-map-js@1.2.0:
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /tree-sitter-haskell@0.21.0(tree-sitter@0.21.1):
+    resolution: {integrity: sha512-b2RLegPHuYPh7nJ3YKWgkWnFYxmYlQDE8TDJuNH+iuNuBcCMYyaA9JlJlMHfCvf7DmJNPtqqbO9Kh9NXEmbatQ==}
+    requiresBuild: true
+    peerDependencies:
+      tree-sitter: ^0.21.0
+      tree_sitter: '*'
+    peerDependenciesMeta:
+      tree_sitter:
+        optional: true
+    dependencies:
+      node-addon-api: 8.0.0
+      node-gyp-build: 4.8.1
+      tree-sitter: 0.21.1
+    dev: true
+
+  /tree-sitter@0.21.1:
+    resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
+    requiresBuild: true
+    dependencies:
+      node-addon-api: 8.0.0
+      node-gyp-build: 4.8.1
+    dev: true
+
+  /vite@5.2.11:
+    resolution: {integrity: sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || >=20.0.0
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+    dependencies:
+      esbuild: 0.20.2
+      postcss: 8.4.38
+      rollup: 4.17.2
+    optionalDependencies:
+      fsevents: 2.3.3
+    dev: true
+
+  /web-tree-sitter@0.20.8:
+    resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
+    dev: false
diff --git a/packages/hs2js/src/hs2js.mjs b/packages/hs2js/src/hs2js.mjs
new file mode 100644
index 00000000..1f894d14
--- /dev/null
+++ b/packages/hs2js/src/hs2js.mjs
@@ -0,0 +1,139 @@
+import { parse } from "./parser.mjs";
+
+function runApply(node, scope, ops) {
+  if (node.children.length !== 2)
+    throw new Error(
+      `expected 2 children for node type apply, got ${node.children.length}`
+    );
+  const [fn, arg] = node.children.map((child) => run(child, scope, ops));
+  if (typeof fn !== "function") {
+    throw new Error(`${node.children[0].text} is not a function`);
+  }
+  // only works if fn is curried!
+  return fn(arg);
+}
+
+function runInfix(left, symbol, right, ops) {
+  const customOp = ops[symbol];
+  if (customOp) {
+    return customOp(left, right);
+  }
+  switch (symbol) {
+    case "+":
+      return left + right;
+    case "-":
+      return left - right;
+    case "*":
+      return left * right;
+    case "/":
+      return left / right;
+    case "$":
+      return left(right);
+    case "&":
+      console.log("right", right);
+      return right(left);
+    case ".":
+      return (x) => left(right(x));
+    default:
+      throw new Error("unexpected infix operator " + symbol);
+  }
+}
+
+function curry(patterns, body, scope, ops) {
+  const [variable, ...rest] = patterns;
+  return (arg) => {
+    let _scope = { ...scope, [variable.text]: arg };
+    if (patterns.length === 1) {
+      const result = run(body, _scope, ops);
+      return result;
+    }
+    return curry(rest, body, _scope, ops);
+  };
+}
+
+export function run(node, scope, ops = {}) {
+  let runInScope = (node, scp = scope) => run(node, scp, ops);
+  //console.log("node", node.type, node.text);
+  switch (node.type) {
+    case "ERROR":
+      throw new Error(`invalid syntax: "${node.text}"`);
+    case "declarations":
+      let result;
+      node.children.forEach((declaration) => {
+        result = runInScope(declaration);
+      });
+      return result;
+    case "integer":
+      return Number(node.text);
+    case "float":
+      return Number(node.text);
+    case "string":
+      const str = node.text.slice(1, -1);
+      return String(str);
+    case "lambda":
+      const [_, lpatterns, __, lbody] = node.children;
+      return curry(lpatterns.children, lbody, scope, ops);
+    case "function":
+      const [fvariable, fpatterns, fbody] = node.children;
+      scope[fvariable.text] = curry(fpatterns.children, fbody, scope, ops);
+      return scope[fvariable.text];
+    case "list": {
+      return node.children
+        .filter((_, i) => i % 2 === 1) // elements are at odd indices
+        .map((node) => runInScope(node));
+    }
+    case "match":
+      if (node.children[0].text !== "=" || node.children.length !== 2) {
+        throw new Error("match node so far only support simple assignments");
+      }
+      return runInScope(node.children[1]);
+    case "bind":
+      if (node.children.length !== 2)
+        throw new Error("expected 2 children for node type bind");
+      if (node.children[0].type !== "variable")
+        throw new Error("expected variable as first child of bind node");
+      if (node.children[1].type !== "match")
+        throw new Error("expected match as first child of bind node");
+      const [bvariable, bmatch] = node.children;
+      const value = runInScope(bmatch);
+      scope[bvariable.text] = value;
+      return value;
+    case "variable":
+      return scope[node.text];
+    case "infix": {
+      const [a, op, b] = node.children;
+      const symbol = op.text;
+      const [left, right] = [runInScope(a), runInScope(b)];
+      return runInfix(left, symbol, right, ops);
+    }
+    case "apply":
+      return runApply(node, scope, ops);
+    case "left_section": {
+      const [_, b, op] = node.children;
+      const right = runInScope(b);
+      return (left) => runInfix(left, op.text, right, ops);
+    }
+    case "right_section": {
+      const [_, op, b] = node.children;
+      const right = runInScope(b);
+      return (left) => runInfix(left, op.text, right, ops);
+    }
+    case "parens":
+      if (node.children.length !== 3)
+        throw new Error("expected 3 children for node type parens");
+      return runInScope(node.children[1]);
+    default:
+      if (node.children.length === 0) {
+        throw new Error("unhandled leaf type " + node.type);
+      }
+      if (node.children.length > 1) {
+        throw new Error("unhandled branch type " + node.type);
+      }
+      return runInScope(node.children[0]);
+  }
+}
+
+export async function evaluate(haskellCode, scope = globalThis, ops) {
+  const ast = await parse(haskellCode);
+  return run(ast.rootNode, scope, ops);
+}
diff --git a/packages/hs2js/src/index.mjs b/packages/hs2js/src/index.mjs
new file mode 100644
index 00000000..170ef1b6
--- /dev/null
+++ b/packages/hs2js/src/index.mjs
@@ -0,0 +1,2 @@
+export * from "./hs2js.mjs";
+export * from "./parser.mjs";
diff --git a/packages/hs2js/src/parser.mjs b/packages/hs2js/src/parser.mjs
new file mode 100644
index 00000000..829a5da3
--- /dev/null
+++ b/packages/hs2js/src/parser.mjs
@@ -0,0 +1,37 @@
+import Parser from "web-tree-sitter";
+
+let base = "/";
+export function setBase(path) {
+  base = path;
+}
+
+async function _loadParser() {
+  await Parser.init({
+    locateFile(scriptName, scriptDirectory) {
+      return `${base}${scriptName}`;
+    },
+  });
+  const parser = new Parser();
+  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
+  parser.setLanguage(Lang);
+  return parser;
+}
+
+let parserLoaded;
+export function loadParser() {
+  if (!parserLoaded) {
+    parserLoaded = _loadParser();
+  }
+  return parserLoaded;
+}
+
+export async function parse(code) {
+  const parser = await loadParser();
+  // for some reason, the parser doesn't like new lines..
+  return parser.parse(
+    code
+      .replaceAll("\n\n", "~~~~")
+      .replaceAll("\n", "")
+      .replaceAll("~~~~", "\n")
+  );
+}
diff --git a/packages/hs2js/vite.config.mjs b/packages/hs2js/vite.config.mjs
new file mode 100644
index 00000000..9eb4a07a
--- /dev/null
+++ b/packages/hs2js/vite.config.mjs
@@ -0,0 +1,20 @@
+import { defineConfig } from "vite";
+import { resolve } from "path";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [],
+  build: {
+    lib: {
+      entry: resolve(__dirname, "src", "index.mjs"),
+      name: "hs2js",
+      formats: ["es", "iife"],
+      fileName: (ext) => ({ es: "index.mjs", iife: "index.js" }[ext]),
+    },
+    rollupOptions: {
+      // external: [...Object.keys(dependencies)],
+      plugins: [],
+    },
+    target: "esnext",
+  },
+});
diff --git a/packages/tidal/main.js b/packages/tidal/main.js
index b1d40198..0b2ac7d5 100644
--- a/packages/tidal/main.js
+++ b/packages/tidal/main.js
@@ -1,6 +1,5 @@
-import { run } from './hs2js.mjs';
+import { run, parse } from 'hs2js';
 import { renderGraph } from './graph.mjs';
-import { parse } from './parser.mjs';
 import { initStrudel, reify, late, samples, stack } from '@strudel/web';
 initStrudel({
   prebake: () => samples('github:tidalcycles/dirt-samples'),
diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index 7d8b72e4..7c12cbb6 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -7,8 +7,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "postinstall": "cp node_modules/web-tree-sitter/tree-sitter.wasm public && npm run build:parser",
-    "build:parser": "tree-sitter build-wasm node_modules/tree-sitter-haskell && mv tree-sitter-haskell.wasm public"
+    "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
   },
   "repository": {
     "type": "git",
@@ -30,13 +29,10 @@
   "dependencies": {
     "@hpcc-js/wasm": "^2.15.3",
     "jgf-dot": "^1.1.1",
-    "web-tree-sitter": "^0.22.6",
-    "tree-sitter-haskell": "^0.21.0",
-    "@strudel/web": "workspace:*"
+    "@strudel/web": "workspace:*",
+    "hs2js": "workspace:*"
   },
   "devDependencies": {
-    "tree-sitter": "^0.21.1",
-    "tree-sitter-cli": "^0.20.8",
     "vite": "^5.0.8"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 577954cb..8ac9adb0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -251,6 +251,19 @@ importers:
 
   packages/embed: {}
 
+  packages/hs2js:
+    dependencies:
+      web-tree-sitter:
+        specifier: ^0.20.8
+        version: 0.20.8
+    devDependencies:
+      tree-sitter-haskell:
+        specifier: ^0.21.0
+        version: 0.21.0(tree-sitter@0.21.1)
+      vite:
+        specifier: ^5.0.10
+        version: 5.2.2(@types/node@20.10.6)
+
   packages/hydra:
     dependencies:
       '@strudel/core':
@@ -417,22 +430,13 @@ importers:
       '@strudel/web':
         specifier: workspace:*
         version: link:../web
+      hs2js:
+        specifier: workspace:*
+        version: link:../hs2js
       jgf-dot:
         specifier: ^1.1.1
         version: 1.1.1
-      tree-sitter-haskell:
-        specifier: ^0.21.0
-        version: 0.21.0(tree-sitter@0.21.1)
-      web-tree-sitter:
-        specifier: ^0.22.6
-        version: 0.22.6
     devDependencies:
-      tree-sitter:
-        specifier: ^0.21.1
-        version: 0.21.1
-      tree-sitter-cli:
-        specifier: ^0.20.8
-        version: 0.20.8
       vite:
         specifier: ^5.0.8
         version: 5.2.2(@types/node@20.10.6)
@@ -10730,6 +10734,7 @@ packages:
   /node-addon-api@8.0.0:
     resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
     engines: {node: ^18 || ^20 || >= 21}
+    dev: true
 
   /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
@@ -10777,6 +10782,7 @@ packages:
   /node-gyp-build@4.8.1:
     resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==}
     hasBin: true
+    dev: true
 
   /node-gyp@10.0.1:
     resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==}
@@ -13507,12 +13513,6 @@ packages:
       punycode: 2.3.1
     dev: true
 
-  /tree-sitter-cli@0.20.8:
-    resolution: {integrity: sha512-XjTcS3wdTy/2cc/ptMLc/WRyOLECRYcMTrSWyhZnj1oGSOWbHLTklgsgRICU3cPfb0vy+oZCC33M43u6R1HSCA==}
-    hasBin: true
-    requiresBuild: true
-    dev: true
-
   /tree-sitter-haskell@0.21.0(tree-sitter@0.21.1):
     resolution: {integrity: sha512-b2RLegPHuYPh7nJ3YKWgkWnFYxmYlQDE8TDJuNH+iuNuBcCMYyaA9JlJlMHfCvf7DmJNPtqqbO9Kh9NXEmbatQ==}
     requiresBuild: true
@@ -13526,7 +13526,7 @@ packages:
       node-addon-api: 8.0.0
       node-gyp-build: 4.8.1
       tree-sitter: 0.21.1
-    dev: false
+    dev: true
 
   /tree-sitter@0.21.1:
     resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
@@ -13534,6 +13534,7 @@ packages:
     dependencies:
       node-addon-api: 8.0.0
       node-gyp-build: 4.8.1
+    dev: true
 
   /trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
@@ -14333,10 +14334,6 @@ packages:
     resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
     dev: false
 
-  /web-tree-sitter@0.22.6:
-    resolution: {integrity: sha512-hS87TH71Zd6mGAmYCvlgxeGDjqd9GTeqXNqTT+u0Gs51uIozNIaaq/kUAbV/Zf56jb2ZOyG8BxZs2GG9wbLi6Q==}
-    dev: false
-
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 

From 0123f4e5f3c5abf2871c6a61de51d4d0865d7ec9 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 10:02:14 +0200
Subject: [PATCH 15/47] fix lint errors + cleanup

---
 .eslintignore                  |   2 +-
 packages/hs2js/src/hs2js.mjs   |  78 +++++++++-----------
 packages/hs2js/src/index.mjs   |   4 +-
 packages/hs2js/src/parser.mjs  |  11 +--
 packages/hs2js/vite.config.js  |  20 +++++
 packages/hs2js/vite.config.mjs |  20 -----
 packages/tidal/hs2js.mjs       | 130 ---------------------------------
 packages/tidal/parser.mjs      |  22 ------
 8 files changed, 62 insertions(+), 225 deletions(-)
 create mode 100644 packages/hs2js/vite.config.js
 delete mode 100644 packages/hs2js/vite.config.mjs
 delete mode 100644 packages/tidal/hs2js.mjs
 delete mode 100644 packages/tidal/parser.mjs

diff --git a/.eslintignore b/.eslintignore
index a16bd3cd..30e8a0ff 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -22,4 +22,4 @@ vite.config.js
 reverbGen.mjs
 hydra.mjs
 jsdoc-synonyms.js
-packages/tidal/hs2js.mjs
\ No newline at end of file
+packages/hs2js/src/hs2js.mjs
\ No newline at end of file
diff --git a/packages/hs2js/src/hs2js.mjs b/packages/hs2js/src/hs2js.mjs
index 1f894d14..e7b7cf46 100644
--- a/packages/hs2js/src/hs2js.mjs
+++ b/packages/hs2js/src/hs2js.mjs
@@ -1,12 +1,10 @@
-import { parse } from "./parser.mjs";
+import { parse } from './parser.mjs';
 
 function runApply(node, scope, ops) {
   if (node.children.length !== 2)
-    throw new Error(
-      `expected 2 children for node type apply, got ${node.children.length}`
-    );
+    throw new Error(`expected 2 children for node type apply, got ${node.children.length}`);
   const [fn, arg] = node.children.map((child) => run(child, scope, ops));
-  if (typeof fn !== "function") {
+  if (typeof fn !== 'function') {
     throw new Error(`${node.children[0].text} is not a function`);
   }
   // only works if fn is curried!
@@ -19,23 +17,23 @@ function runInfix(left, symbol, right, ops) {
     return customOp(left, right);
   }
   switch (symbol) {
-    case "+":
+    case '+':
       return left + right;
-    case "-":
+    case '-':
       return left - right;
-    case "*":
+    case '*':
       return left * right;
-    case "/":
+    case '/':
       return left / right;
-    case "$":
+    case '$':
       return left(right);
-    case "&":
-      console.log("right", right);
+    case '&':
+      console.log('right', right);
       return right(left);
-    case ".":
+    case '.':
       return (x) => left(right(x));
     default:
-      throw new Error("unexpected infix operator " + symbol);
+      throw new Error('unexpected infix operator ' + symbol);
   }
 }
 
@@ -55,79 +53,75 @@ export function run(node, scope, ops = {}) {
   let runInScope = (node, scp = scope) => run(node, scp, ops);
   //console.log("node", node.type, node.text);
   switch (node.type) {
-    case "ERROR":
+    case 'ERROR':
       throw new Error(`invalid syntax: "${node.text}"`);
-    case "declarations":
+    case 'declarations':
       let result;
       node.children.forEach((declaration) => {
         result = runInScope(declaration);
       });
       return result;
-    case "integer":
+    case 'integer':
       return Number(node.text);
-    case "float":
+    case 'float':
       return Number(node.text);
-    case "string":
+    case 'string':
       const str = node.text.slice(1, -1);
       return String(str);
-    case "lambda":
+    case 'lambda':
       const [_, lpatterns, __, lbody] = node.children;
       return curry(lpatterns.children, lbody, scope, ops);
-    case "function":
+    case 'function':
       const [fvariable, fpatterns, fbody] = node.children;
       scope[fvariable.text] = curry(fpatterns.children, fbody, scope, ops);
       return scope[fvariable.text];
-    case "list": {
+    case 'list': {
       return node.children
         .filter((_, i) => i % 2 === 1) // elements are at odd indices
         .map((node) => runInScope(node));
     }
-    case "match":
-      if (node.children[0].text !== "=" || node.children.length !== 2) {
-        throw new Error("match node so far only support simple assignments");
+    case 'match':
+      if (node.children[0].text !== '=' || node.children.length !== 2) {
+        throw new Error('match node so far only support simple assignments');
       }
       return runInScope(node.children[1]);
-    case "bind":
-      if (node.children.length !== 2)
-        throw new Error("expected 2 children for node type bind");
-      if (node.children[0].type !== "variable")
-        throw new Error("expected variable as first child of bind node");
-      if (node.children[1].type !== "match")
-        throw new Error("expected match as first child of bind node");
+    case 'bind':
+      if (node.children.length !== 2) throw new Error('expected 2 children for node type bind');
+      if (node.children[0].type !== 'variable') throw new Error('expected variable as first child of bind node');
+      if (node.children[1].type !== 'match') throw new Error('expected match as first child of bind node');
       const [bvariable, bmatch] = node.children;
       const value = runInScope(bmatch);
       scope[bvariable.text] = value;
       return value;
-    case "variable":
+    case 'variable':
       return scope[node.text];
-    case "infix": {
+    case 'infix': {
       const [a, op, b] = node.children;
       const symbol = op.text;
       const [left, right] = [runInScope(a), runInScope(b)];
       return runInfix(left, symbol, right, ops);
     }
-    case "apply":
+    case 'apply':
       return runApply(node, scope, ops);
-    case "left_section": {
+    case 'left_section': {
       const [_, b, op] = node.children;
       const right = runInScope(b);
       return (left) => runInfix(left, op.text, right, ops);
     }
-    case "right_section": {
+    case 'right_section': {
       const [_, op, b] = node.children;
       const right = runInScope(b);
       return (left) => runInfix(left, op.text, right, ops);
     }
-    case "parens":
-      if (node.children.length !== 3)
-        throw new Error("expected 3 children for node type parens");
+    case 'parens':
+      if (node.children.length !== 3) throw new Error('expected 3 children for node type parens');
       return runInScope(node.children[1]);
     default:
       if (node.children.length === 0) {
-        throw new Error("unhandled leaf type " + node.type);
+        throw new Error('unhandled leaf type ' + node.type);
       }
       if (node.children.length > 1) {
-        throw new Error("unhandled branch type " + node.type);
+        throw new Error('unhandled branch type ' + node.type);
       }
       return runInScope(node.children[0]);
   }
diff --git a/packages/hs2js/src/index.mjs b/packages/hs2js/src/index.mjs
index 170ef1b6..c3aab230 100644
--- a/packages/hs2js/src/index.mjs
+++ b/packages/hs2js/src/index.mjs
@@ -1,2 +1,2 @@
-export * from "./hs2js.mjs";
-export * from "./parser.mjs";
+export * from './hs2js.mjs';
+export * from './parser.mjs';
diff --git a/packages/hs2js/src/parser.mjs b/packages/hs2js/src/parser.mjs
index 829a5da3..6fbd9ae2 100644
--- a/packages/hs2js/src/parser.mjs
+++ b/packages/hs2js/src/parser.mjs
@@ -1,6 +1,6 @@
-import Parser from "web-tree-sitter";
+import Parser from 'web-tree-sitter';
 
-let base = "/";
+let base = '/';
 export function setBase(path) {
   base = path;
 }
@@ -28,10 +28,5 @@ export function loadParser() {
 export async function parse(code) {
   const parser = await loadParser();
   // for some reason, the parser doesn't like new lines..
-  return parser.parse(
-    code
-      .replaceAll("\n\n", "~~~~")
-      .replaceAll("\n", "")
-      .replaceAll("~~~~", "\n")
-  );
+  return parser.parse(code.replaceAll('\n\n', '~~~~').replaceAll('\n', '').replaceAll('~~~~', '\n'));
 }
diff --git a/packages/hs2js/vite.config.js b/packages/hs2js/vite.config.js
new file mode 100644
index 00000000..ce715712
--- /dev/null
+++ b/packages/hs2js/vite.config.js
@@ -0,0 +1,20 @@
+import { defineConfig } from 'vite';
+import { resolve } from 'path';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [],
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src', 'index.mjs'),
+      name: 'hs2js',
+      formats: ['es', 'iife'],
+      fileName: (ext) => ({ es: 'index.mjs', iife: 'index.js' })[ext],
+    },
+    rollupOptions: {
+      // external: [...Object.keys(dependencies)],
+      plugins: [],
+    },
+    target: 'esnext',
+  },
+});
diff --git a/packages/hs2js/vite.config.mjs b/packages/hs2js/vite.config.mjs
deleted file mode 100644
index 9eb4a07a..00000000
--- a/packages/hs2js/vite.config.mjs
+++ /dev/null
@@ -1,20 +0,0 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, "src", "index.mjs"),
-      name: "hs2js",
-      formats: ["es", "iife"],
-      fileName: (ext) => ({ es: "index.mjs", iife: "index.js" }[ext]),
-    },
-    rollupOptions: {
-      // external: [...Object.keys(dependencies)],
-      plugins: [],
-    },
-    target: "esnext",
-  },
-});
diff --git a/packages/tidal/hs2js.mjs b/packages/tidal/hs2js.mjs
deleted file mode 100644
index 733b7aeb..00000000
--- a/packages/tidal/hs2js.mjs
+++ /dev/null
@@ -1,130 +0,0 @@
-function runApply(node, scope, ops) {
-  if (node.children.length !== 2)
-    throw new Error(`expected 2 children for node type apply, got ${node.children.length}`);
-  const [fn, arg] = node.children.map((child) => run(child, scope, ops));
-  if (typeof fn !== 'function') {
-    throw new Error(`${node.children[0].text} is not a function`);
-  }
-  // only works if fn is curried!
-  return fn(arg);
-}
-
-function runInfix(left, symbol, right, ops) {
-  const customOp = ops[symbol];
-  if (customOp) {
-    return customOp(left, right);
-  }
-  switch (symbol) {
-    case '+':
-      return left + right;
-    case '-':
-      return left - right;
-    case '*':
-      return left * right;
-    case '/':
-      return left / right;
-    case '$':
-      return left(right);
-    case '&':
-      return right(left);
-    case '.':
-      return (x) => left(right(x));
-    default:
-      throw new Error('unexpected infix operator ' + symbol);
-  }
-}
-
-function curry(patterns, body, scope, ops) {
-  const [variable, ...rest] = patterns;
-  return (arg) => {
-    let _scope = { ...scope, [variable.text]: arg };
-    if (patterns.length === 1) {
-      const result = run(body, _scope, ops);
-      return result;
-    }
-    return curry(rest, body, _scope, ops);
-  };
-}
-
-export function run(node, scope, ops = {}) {
-  let runInScope = (node, scp = scope) => run(node, scp, ops);
-  //console.log("node", node.type, node.text);
-  switch (node.type) {
-    case 'ERROR':
-      throw new Error(`invalid syntax: "${node.text}"`);
-    case 'declarations':
-      let result;
-      node.children.forEach((declaration) => {
-        result = runInScope(declaration);
-      });
-      return result;
-    case 'integer':
-      return Number(node.text);
-    case 'float':
-      return Number(node.text);
-    case 'string':
-      const str = node.text.slice(1, -1);
-      return String(str);
-    case 'lambda':
-      const [_, lpatterns, __, lbody] = node.children;
-      return curry(lpatterns.children, lbody, scope, ops);
-    case 'function':
-      const [fvariable, fpatterns, fbody] = node.children;
-      scope[fvariable.text] = curry(fpatterns.children, fbody, scope, ops);
-      return scope[fvariable.text];
-    case 'list': {
-      return node.children
-        .filter((_, i) => i % 2 === 1) // elements are at odd indices
-        .map((node) => runInScope(node));
-    }
-    case 'match':
-      if (node.children[0].text !== '=' || node.children.length !== 2) {
-        throw new Error('match node so far only support simple assignments');
-      }
-      return runInScope(node.children[1]);
-    case 'bind':
-      if (node.children.length !== 2) throw new Error('expected 2 children for node type bind');
-      if (node.children[0].type !== 'variable') throw new Error('expected variable as first child of bind node');
-      if (node.children[1].type !== 'match') throw new Error('expected match as first child of bind node');
-      const [bvariable, bmatch] = node.children;
-      const value = runInScope(bmatch);
-      scope[bvariable.text] = value;
-      return value;
-    case 'variable':
-      return scope[node.text];
-    case 'infix': {
-      const [a, op, b] = node.children;
-      const symbol = op.text;
-      const [left, right] = [runInScope(a), runInScope(b)];
-      return runInfix(left, symbol, right, ops);
-    }
-    case 'apply':
-      return runApply(node, scope, ops);
-    case 'left_section': {
-      const [_, b, op] = node.children;
-      const right = runInScope(b);
-      return (left) => runInfix(left, op.text, right, ops);
-    }
-    case 'right_section': {
-      const [_, op, b] = node.children;
-      const right = runInScope(b);
-      return (left) => runInfix(left, op.text, right, ops);
-    }
-    case 'parens':
-      if (node.children.length !== 3) throw new Error('expected 3 children for node type parens');
-      return runInScope(node.children[1]);
-    default:
-      if (node.children.length === 0) {
-        throw new Error('unhandled leaf type ' + node.type);
-      }
-      if (node.children.length > 1) {
-        throw new Error('unhandled branch type ' + node.type);
-      }
-      return runInScope(node.children[0]);
-  }
-}
-
-export async function evaluate(haskellCode, scope = globalThis, ops) {
-  const ast = await parse(haskellCode);
-  return run(ast.rootNode, scope, ops);
-}
diff --git a/packages/tidal/parser.mjs b/packages/tidal/parser.mjs
deleted file mode 100644
index 1b1f8a03..00000000
--- a/packages/tidal/parser.mjs
+++ /dev/null
@@ -1,22 +0,0 @@
-import Parser from 'web-tree-sitter';
-
-const base = import.meta.env.BASE_URL;
-
-async function loadParser() {
-  await Parser.init({
-    locateFile(scriptName, scriptDirectory) {
-      return `${base}${scriptName}`;
-    },
-  });
-  const parser = new Parser();
-  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
-  parser.setLanguage(Lang);
-  return parser;
-}
-
-let parserLoaded = loadParser();
-export async function parse(code) {
-  const parser = await parserLoaded;
-  // for some reason, the parser doesn't like new lines..
-  return parser.parse(code.replaceAll('\n\n', '~~~~').replaceAll('\n', '').replaceAll('~~~~', '\n'));
-}

From bbeb243cea02f2a9da9b532a04d953a859c95d71 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 10:05:18 +0200
Subject: [PATCH 16/47] replace postinstall with prepare for dev only

---
 packages/tidal/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index 7c12cbb6..e2f94c56 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -7,7 +7,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
+    "prepare": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
   },
   "repository": {
     "type": "git",

From 8c480807d280f0dc4cdd4b8b1d8b9fc6bdd1f53c Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 10:11:22 +0200
Subject: [PATCH 17/47] remove prepare script for now

---
 packages/tidal/README.md    | 3 +--
 packages/tidal/package.json | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/tidal/README.md b/packages/tidal/README.md
index 24f3efc3..8b07ac19 100644
--- a/packages/tidal/README.md
+++ b/packages/tidal/README.md
@@ -5,7 +5,6 @@ This is an experiment in implementing tree-sitter for parsing haskell.
 ```sh
 pnpm i
 cd haskell
+pnpm copy-wasm
 pnpm dev
 ```
-
-This 
\ No newline at end of file
diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index e2f94c56..3cab8182 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -5,9 +5,9 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
+    "build": "pnpm copy-wasm && vite build",
     "preview": "vite preview",
-    "prepare": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
+    "copy-wasm": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
   },
   "repository": {
     "type": "git",

From f54f80e698b9c95f9be5d7b641fcefa44e01a0eb Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 10:14:26 +0200
Subject: [PATCH 18/47] bump version

---
 examples/buildless/hs2js.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/buildless/hs2js.html b/examples/buildless/hs2js.html
index 5ffb6cf0..96b53c53 100644
--- a/examples/buildless/hs2js.html
+++ b/examples/buildless/hs2js.html
@@ -1,7 +1,7 @@
-
+
 
 
+    
+    
+  
+
diff --git a/packages/tidal/graph.mjs b/packages/tidal/graph.mjs
deleted file mode 100644
index bac3d135..00000000
--- a/packages/tidal/graph.mjs
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Graphviz } from '@hpcc-js/wasm';
-import toDot from 'jgf-dot';
-
-const graphvizLoaded = Graphviz.load();
-
-function walk(node, branch = [0], parent) {
-  let nodes = [];
-  let edges = [];
-  const color = 'white';
-  const current = {
-    id: branch.join('-'),
-    color,
-    fontcolor: color,
-    label: node.type.replace('\\', 'lambda'), // backslash kills graphviz..
-  };
-  nodes.push(current);
-  parent && edges.push({ source: parent.id, target: current.id, color });
-  if (node.children.length) {
-    node.children.forEach((child, j) => {
-      const { nodes: childNodes, edges: childEdges } = walk(child, branch.concat([j]), current);
-      nodes = nodes.concat(childNodes || []);
-      edges = edges.concat(childEdges || []);
-    });
-  }
-  return { nodes, edges };
-}
-
-export async function renderGraph(tree, container) {
-  const { nodes, edges } = walk(tree.rootNode);
-  const graphviz = await graphvizLoaded;
-  let dot = toDot({
-    graph: {
-      nodes,
-      edges,
-    },
-  });
-  dot = dot.split('\n');
-  dot.splice(1, 0, 'bgcolor="transparent"');
-  dot.splice(1, 0, 'color="white"');
-  dot = dot.join('\n');
-  const svg = await graphviz.layout(dot, 'svg', 'dot', {});
-  container.innerHTML = svg;
-}
diff --git a/packages/tidal/index.html b/packages/tidal/index.html
index 532bce3d..cfa818b0 100644
--- a/packages/tidal/index.html
+++ b/packages/tidal/index.html
@@ -23,7 +23,6 @@
   
     
     

-    

     
   
 
diff --git a/packages/tidal/main.js b/packages/tidal/main.js
index 0b2ac7d5..0d948504 100644
--- a/packages/tidal/main.js
+++ b/packages/tidal/main.js
@@ -1,12 +1,9 @@
 import { run, parse } from 'hs2js';
-import { renderGraph } from './graph.mjs';
 import { initStrudel, reify, late, samples, stack } from '@strudel/web';
 initStrudel({
   prebake: () => samples('github:tidalcycles/dirt-samples'),
 });
 
-const graphContainer = document.getElementById('graph');
-
 const textarea = document.getElementById('code');
 if (window.location.hash) {
   textarea.value = atob(window.location.hash.slice(1));
@@ -60,12 +57,6 @@ async function update() {
   }
   console.log('parsed tree');
   console.log(tree.rootNode.toString());
-  try {
-    renderGraph(tree, graphContainer);
-  } catch (err) {
-    console.warn('could not render graph');
-    console.error(err);
-  }
   try {
     let patterns = {};
     window.p = (name, pattern) => {
diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index 3cab8182..0e2d8aa5 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -27,8 +27,6 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@hpcc-js/wasm": "^2.15.3",
-    "jgf-dot": "^1.1.1",
     "@strudel/web": "workspace:*",
     "hs2js": "workspace:*"
   },

From d108de40d05b1a6968566cd2feb7d287bb7de0a0 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 18:41:43 +0200
Subject: [PATCH 23/47] rename

---
 packages/tidal/index.html             | 2 +-
 packages/tidal/{main.js => tidal.mjs} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/tidal/{main.js => tidal.mjs} (100%)

diff --git a/packages/tidal/index.html b/packages/tidal/index.html
index cfa818b0..7f88bf0a 100644
--- a/packages/tidal/index.html
+++ b/packages/tidal/index.html
@@ -23,6 +23,6 @@
   
     
     

-    
+    
   
 
diff --git a/packages/tidal/main.js b/packages/tidal/tidal.mjs
similarity index 100%
rename from packages/tidal/main.js
rename to packages/tidal/tidal.mjs

From fd950d4476da7650936bc2be9f6325b15de21260 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:36:41 +0200
Subject: [PATCH 24/47] tidy tidal package - move tidal repl to examples - make
 hs2js synchronous

---
 .../tidal => examples/tidal-repl}/.gitignore  |   0
 .../tidal => examples/tidal-repl}/README.md   |   0
 .../tidal => examples/tidal-repl}/index.html  |   3 +-
 examples/tidal-repl/main.js                   |  80 ++++++++++++++
 examples/tidal-repl/package.json              |  36 ++++++
 .../tidal-repl}/public/README.md              |   0
 packages/hs2js/package.json                   |   8 +-
 packages/hs2js/src/hs2js.mjs                  |   4 +-
 packages/hs2js/src/parser.mjs                 |  11 +-
 packages/tidal/package.json                   |  26 ++---
 packages/tidal/tidal.mjs                      |  53 ++-------
 pnpm-lock.yaml                                | 104 ++++--------------
 12 files changed, 171 insertions(+), 154 deletions(-)
 rename {packages/tidal => examples/tidal-repl}/.gitignore (100%)
 rename {packages/tidal => examples/tidal-repl}/README.md (100%)
 rename {packages/tidal => examples/tidal-repl}/index.html (91%)
 create mode 100644 examples/tidal-repl/main.js
 create mode 100644 examples/tidal-repl/package.json
 rename {packages/tidal => examples/tidal-repl}/public/README.md (100%)

diff --git a/packages/tidal/.gitignore b/examples/tidal-repl/.gitignore
similarity index 100%
rename from packages/tidal/.gitignore
rename to examples/tidal-repl/.gitignore
diff --git a/packages/tidal/README.md b/examples/tidal-repl/README.md
similarity index 100%
rename from packages/tidal/README.md
rename to examples/tidal-repl/README.md
diff --git a/packages/tidal/index.html b/examples/tidal-repl/index.html
similarity index 91%
rename from packages/tidal/index.html
rename to examples/tidal-repl/index.html
index 7f88bf0a..0d17855e 100644
--- a/packages/tidal/index.html
+++ b/examples/tidal-repl/index.html
@@ -23,6 +23,7 @@
   
     
     

-    
+    
   
 
diff --git a/examples/tidal-repl/main.js b/examples/tidal-repl/main.js
new file mode 100644
index 00000000..9e572ea8
--- /dev/null
+++ b/examples/tidal-repl/main.js
@@ -0,0 +1,80 @@
+import { run, parse } from 'hs2js';
+import { initStrudel, reify, late, samples, stack } from '@strudel/web';
+
+initStrudel({
+  prebake: () => samples('github:tidalcycles/dirt-samples'),
+});
+
+const textarea = document.getElementById('code');
+if (window.location.hash) {
+  textarea.value = atob(window.location.hash.slice(1));
+} else {
+  textarea.value = 'd1 $ s "jvbass(3,8)"';
+}
+textarea.addEventListener('input', (e) => {
+  window.location.hash = btoa(e.target.value);
+  update();
+});
+update();
+
+function getInfixOperators() {
+  let operators = {
+    '>': 'set',
+    '#': 'set',
+    '+': 'add',
+    '-': 'sub',
+    '*': 'mul',
+    '/': 'div',
+  };
+  let alignments = {
+    in: (s) => '|' + s,
+    out: (s) => s + '|',
+    mix: (s) => '|' + s + '|',
+  };
+  let ops = {};
+  Object.entries(operators).forEach(([o, name]) => {
+    // operator without alignment
+    ops[o] = (l, r) => reify(l)[name](reify(r));
+    Object.entries(alignments).forEach(([a, getSymbol]) => {
+      // get symbol with alignment
+      let symbol = getSymbol(o);
+      ops[symbol] = (l, r) => reify(l)[name][a](reify(r));
+    });
+  });
+  ops['~>'] = (l, r) => reify(l).late(reify(r));
+  ops['<~'] = (l, r) => reify(l).early(reify(r));
+  ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
+  return ops;
+}
+const ops = getInfixOperators();
+
+async function update() {
+  let result, tree;
+  try {
+    tree = await parse(textarea.value);
+  } catch (err) {
+    console.warn('parse error');
+    console.error(err);
+  }
+  console.log('parsed tree');
+  console.log(tree.rootNode.toString());
+  try {
+    let patterns = {};
+    window.p = (name, pattern) => {
+      patterns[name] = pattern;
+    };
+    window.d1 = (pat) => window.p(1, pat);
+    window.d2 = (pat) => window.p(2, pat);
+    window.d3 = (pat) => window.p(3, pat);
+    window.rot = late;
+    result = run(tree.rootNode, window, ops);
+    if (Object.values(patterns).length) {
+      stack(...Object.values(patterns)).play();
+    }
+  } catch (err) {
+    console.warn('eval error');
+    console.error(err);
+    result = 'ERROR: ' + err.message;
+  }
+  document.getElementById('result').innerHTML = 'Result: ' + result;
+}
diff --git a/examples/tidal-repl/package.json b/examples/tidal-repl/package.json
new file mode 100644
index 00000000..0e2d8aa5
--- /dev/null
+++ b/examples/tidal-repl/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@strudel/tidal",
+  "private": true,
+  "version": "0.0.1",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "pnpm copy-wasm && vite build",
+    "preview": "vite preview",
+    "copy-wasm": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "titdalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos ",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "dependencies": {
+    "@strudel/web": "workspace:*",
+    "hs2js": "workspace:*"
+  },
+  "devDependencies": {
+    "vite": "^5.0.8"
+  }
+}
diff --git a/packages/tidal/public/README.md b/examples/tidal-repl/public/README.md
similarity index 100%
rename from packages/tidal/public/README.md
rename to examples/tidal-repl/public/README.md
diff --git a/packages/hs2js/package.json b/packages/hs2js/package.json
index 1f980fcc..1d3907b1 100644
--- a/packages/hs2js/package.json
+++ b/packages/hs2js/package.json
@@ -2,8 +2,12 @@
   "name": "hs2js",
   "version": "0.0.7",
   "description": "Experimental Haskell in JavaScript interpreter",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "main": "src/index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
+  },
   "scripts": {
     "build-wasm": "tree-sitter build-wasm node_modules/tree-sitter-haskell && mv tree-sitter-haskell.wasm ./dist/ && cp node_modules/web-tree-sitter/tree-sitter.wasm ./dist/",
     "build": "vite build && npm run build-wasm",
diff --git a/packages/hs2js/src/hs2js.mjs b/packages/hs2js/src/hs2js.mjs
index e7b7cf46..4161b0e6 100644
--- a/packages/hs2js/src/hs2js.mjs
+++ b/packages/hs2js/src/hs2js.mjs
@@ -127,7 +127,7 @@ export function run(node, scope, ops = {}) {
   }
 }
 
-export async function evaluate(haskellCode, scope = globalThis, ops) {
-  const ast = await parse(haskellCode);
+export function evaluate(haskellCode, scope = globalThis, ops) {
+  const ast = parse(haskellCode);
   return run(ast.rootNode, scope, ops);
 }
diff --git a/packages/hs2js/src/parser.mjs b/packages/hs2js/src/parser.mjs
index 6fbd9ae2..25644c7e 100644
--- a/packages/hs2js/src/parser.mjs
+++ b/packages/hs2js/src/parser.mjs
@@ -5,15 +5,18 @@ export function setBase(path) {
   base = path;
 }
 
+let isReady = false,
+  parser;
 async function _loadParser() {
   await Parser.init({
     locateFile(scriptName, scriptDirectory) {
       return `${base}${scriptName}`;
     },
   });
-  const parser = new Parser();
+  parser = new Parser();
   const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
   parser.setLanguage(Lang);
+  isReady = true;
   return parser;
 }
 
@@ -25,8 +28,10 @@ export function loadParser() {
   return parserLoaded;
 }
 
-export async function parse(code) {
-  const parser = await loadParser();
+export function parse(code) {
+  if (!isReady) {
+    throw new Error('hs2js not ready. await loadParser before calling evaluate or parse functions');
+  }
   // for some reason, the parser doesn't like new lines..
   return parser.parse(code.replaceAll('\n\n', '~~~~').replaceAll('\n', '').replaceAll('~~~~', '\n'));
 }
diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index 0e2d8aa5..772f5f4d 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -1,36 +1,26 @@
 {
   "name": "@strudel/tidal",
-  "private": true,
-  "version": "0.0.1",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "pnpm copy-wasm && vite build",
-    "preview": "vite preview",
-    "copy-wasm": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
-  },
+  "version": "0.0.7",
+  "description": "Experimental Tidal Code interpreter",
+  "module": "tidal.mjs",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
+    "url": "git+https://github.com/felixroos/hs2js.git"
   },
   "keywords": [
-    "titdalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
+    "haskell",
+    "javascript"
   ],
   "author": "Felix Roos ",
   "license": "AGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel/tree/main/packages/hs2js",
   "dependencies": {
-    "@strudel/web": "workspace:*",
     "hs2js": "workspace:*"
   },
   "devDependencies": {
-    "vite": "^5.0.8"
+    "vite": "^5.0.10"
   }
 }
diff --git a/packages/tidal/tidal.mjs b/packages/tidal/tidal.mjs
index 0d948504..60a76946 100644
--- a/packages/tidal/tidal.mjs
+++ b/packages/tidal/tidal.mjs
@@ -1,20 +1,4 @@
-import { run, parse } from 'hs2js';
-import { initStrudel, reify, late, samples, stack } from '@strudel/web';
-initStrudel({
-  prebake: () => samples('github:tidalcycles/dirt-samples'),
-});
-
-const textarea = document.getElementById('code');
-if (window.location.hash) {
-  textarea.value = atob(window.location.hash.slice(1));
-} else {
-  textarea.value = 'd1 $ s "jvbass(3,8)"';
-}
-textarea.addEventListener('input', (e) => {
-  window.location.hash = btoa(e.target.value);
-  update();
-});
-update();
+import { evaluate, loadParser } from 'hs2js';
 
 function getInfixOperators() {
   let operators = {
@@ -47,33 +31,10 @@ function getInfixOperators() {
 }
 const ops = getInfixOperators();
 
-async function update() {
-  let result, tree;
-  try {
-    tree = await parse(textarea.value);
-  } catch (err) {
-    console.warn('parse error');
-    console.error(err);
-  }
-  console.log('parsed tree');
-  console.log(tree.rootNode.toString());
-  try {
-    let patterns = {};
-    window.p = (name, pattern) => {
-      patterns[name] = pattern;
-    };
-    window.d1 = (pat) => window.p(1, pat);
-    window.d2 = (pat) => window.p(2, pat);
-    window.d3 = (pat) => window.p(3, pat);
-    window.rot = late;
-    result = run(tree.rootNode, window, ops);
-    if (Object.values(patterns).length) {
-      stack(...Object.values(patterns)).play();
-    }
-  } catch (err) {
-    console.warn('eval error');
-    console.error(err);
-    result = 'ERROR: ' + err.message;
-  }
-  document.getElementById('result').innerHTML = 'Result: ' + result;
+export async function initTidal() {
+  return loadParser();
+}
+
+export function tidal(code) {
+  return evaluate(code, window, ops);
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ac9adb0..7beea16b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,6 +140,19 @@ importers:
         specifier: ^5.0.10
         version: 5.0.10
 
+  examples/tidal-repl:
+    dependencies:
+      '@strudel/web':
+        specifier: workspace:*
+        version: link:../../packages/web
+      hs2js:
+        specifier: workspace:*
+        version: link:../../packages/hs2js
+    devDependencies:
+      vite:
+        specifier: ^5.0.8
+        version: 5.2.2(@types/node@20.10.6)
+
   packages/codemirror:
     dependencies:
       '@codemirror/autocomplete':
@@ -424,21 +437,12 @@ importers:
 
   packages/tidal:
     dependencies:
-      '@hpcc-js/wasm':
-        specifier: ^2.15.3
-        version: 2.16.2
-      '@strudel/web':
-        specifier: workspace:*
-        version: link:../web
       hs2js:
         specifier: workspace:*
         version: link:../hs2js
-      jgf-dot:
-        specifier: ^1.1.1
-        version: 1.1.1
     devDependencies:
       vite:
-        specifier: ^5.0.8
+        specifier: ^5.0.10
         version: 5.2.2(@types/node@20.10.6)
 
   packages/tonal:
@@ -619,6 +623,9 @@ importers:
       '@strudel/soundfonts':
         specifier: workspace:*
         version: link:../packages/soundfonts
+      '@strudel/tidal':
+        specifier: workspace:*
+        version: link:../packages/tidal
       '@strudel/tonal':
         specifier: workspace:*
         version: link:../packages/tonal
@@ -3069,13 +3076,6 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@hpcc-js/wasm@2.16.2:
-    resolution: {integrity: sha512-THiidUMYR8/cIfFT3MVcWuRE7bQKh295nrFBxGvUNc4Nq8e2uU1LtiplHs7AUkJ0GxgvZoR+8TQ1/E3Qb/uE2g==}
-    hasBin: true
-    dependencies:
-      yargs: 17.7.2
-    dev: false
-
   /@humanwhocodes/config-array@0.11.13:
     resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==}
     engines: {node: '>=10.10.0'}
@@ -6269,6 +6269,7 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
+    dev: true
 
   /clone-buffer@1.0.0:
     resolution: {integrity: sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==}
@@ -6986,10 +6987,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /dotty@0.0.1:
-    resolution: {integrity: sha512-eDT0hfJEnQbGaZcTuCfj2igPkQ7qa/n9K2pGGDxhEqKhARLq+xE1TonvpOPHq+7KeG+D6A/V8BwCcsdPom2TQg==}
-    dev: false
-
   /dset@3.1.3:
     resolution: {integrity: sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==}
     engines: {node: '>=4'}
@@ -7911,10 +7908,6 @@ packages:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
     dev: true
 
-  /gather-stream@1.0.0:
-    resolution: {integrity: sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==}
-    dev: false
-
   /gauge@4.0.4:
     resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -8252,33 +8245,6 @@ packages:
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
-  /graphlib-dot@0.6.4:
-    resolution: {integrity: sha512-rdhDTu0mBlloTpFMfkQq+e3y4yL22OqP5MhQbkw6QUURqa+4YLgv3XZy2fA64wdEcJNZ+waI76URemVgdFtzng==}
-    dependencies:
-      graphlib: 2.1.8
-      lodash: 4.17.21
-    dev: false
-
-  /graphlib-json-graph@1.0.0:
-    resolution: {integrity: sha512-sJsFuthZnSL5knaDDZhDx8fg1Zy5t/7ZqVHiytoeSzezGhMoSFD3T3K5YQakKFEyXtYjOzbnvsyr2qo+6/qq/Q==}
-    dependencies:
-      graphlib: 1.0.7
-      par: 0.3.0
-      prop: 0.1.1
-    dev: false
-
-  /graphlib@1.0.7:
-    resolution: {integrity: sha512-jNb7RbqTIRyZRmcVCxGefOlGWjNdbjcT2tFj36zhnRa8yhAlOvydh9nBixfLQIqSU+DwCx47tg3ysw8NIYhpsA==}
-    dependencies:
-      lodash: 3.10.1
-    dev: false
-
-  /graphlib@2.1.8:
-    resolution: {integrity: sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==}
-    dependencies:
-      lodash: 4.17.21
-    dev: false
-
   /gray-matter@4.0.3:
     resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
     engines: {node: '>=6.0'}
@@ -9184,15 +9150,6 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /jgf-dot@1.1.1:
-    resolution: {integrity: sha512-/aw9bwVfn67A+lvjxtbocBuhB2rNdL5UY5rlHhKVh9ValvVJETU5lQ0jitDxiIjIPAEeuR4B1aFNA7E3wKNV1A==}
-    hasBin: true
-    dependencies:
-      graphlib-dot: 0.6.4
-      graphlib-json-graph: 1.0.0
-      read-file-stdin: 0.2.1
-    dev: false
-
   /jiti@1.21.0:
     resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
     hasBin: true
@@ -9649,12 +9606,9 @@ packages:
     resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
     dev: true
 
-  /lodash@3.10.1:
-    resolution: {integrity: sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==}
-    dev: false
-
   /lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+    dev: true
 
   /log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
@@ -11370,11 +11324,6 @@ packages:
       - supports-color
     dev: true
 
-  /par@0.3.0:
-    resolution: {integrity: sha512-6V910zFAoHnxjX6ILkwbQcpIkD3KI2gBAPfCtZQNaJTvTxgIoKXSwDQIE3ty0zbOGdBXHRnl6rd66a5jj12pfw==}
-    engines: {node: '>=0.6'}
-    dev: false
-
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -11845,12 +11794,6 @@ packages:
       read: 2.1.0
     dev: true
 
-  /prop@0.1.1:
-    resolution: {integrity: sha512-hf5DdgiPkcoVxBfuSknP918U0lDC+7lArIjIB2U4Gh79p1Xtc0JP6W5DW3c0wC0x9/A6CsAISh3202I1GlMgkw==}
-    dependencies:
-      dotty: 0.0.1
-    dev: false
-
   /property-information@6.2.0:
     resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==}
 
@@ -11982,12 +11925,6 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dev: true
 
-  /read-file-stdin@0.2.1:
-    resolution: {integrity: sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==}
-    dependencies:
-      gather-stream: 1.0.0
-    dev: false
-
   /read-package-json-fast@3.0.2:
     resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -14642,6 +14579,7 @@ packages:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
+    dev: true
 
   /wrap-ansi@8.1.0:
     resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
@@ -14733,6 +14671,7 @@ packages:
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
+    dev: true
 
   /yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
@@ -14803,6 +14742,7 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
+    dev: true
 
   /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}

From a35e9aef0ea75ea7ba8a4dfc23ec6d637b9a9c4a Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:37:04 +0200
Subject: [PATCH 25/47] add tidal package to website

---
 website/.gitignore        | 3 +++
 website/package.json      | 4 +++-
 website/src/repl/util.mjs | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/website/.gitignore b/website/.gitignore
index 02f6e50b..60c587b1 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -17,3 +17,6 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+
+public/tree-sitter.wasm
+public/tree-sitter-haskell.wasm
\ No newline at end of file
diff --git a/website/package.json b/website/package.json
index 5065c106..16d86d93 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,8 @@
     "check": "astro check && tsc",
     "build": "astro build",
     "preview": "astro preview --port 3009 --host 0.0.0.0",
-    "astro": "astro"
+    "astro": "astro",
+    "postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
   },
   "dependencies": {
     "@algolia/client-search": "^4.22.0",
@@ -39,6 +40,7 @@
     "@strudel/transpiler": "workspace:*",
     "@strudel/webaudio": "workspace:*",
     "@strudel/xen": "workspace:*",
+    "@strudel/tidal": "workspace:*",
     "@supabase/supabase-js": "^2.39.1",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.10",
diff --git a/website/src/repl/util.mjs b/website/src/repl/util.mjs
index 3147ae38..703d3447 100644
--- a/website/src/repl/util.mjs
+++ b/website/src/repl/util.mjs
@@ -82,6 +82,7 @@ export function loadModules() {
     import('@strudel/serial'),
     import('@strudel/soundfonts'),
     import('@strudel/csound'),
+    import('@strudel/tidal'),
   ];
   if (isTauri()) {
     modules = modules.concat([

From 5b89500acd36187ef6e2b2d852bfa4df0df3396c Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:38:30 +0200
Subject: [PATCH 26/47] fix: lint + format

---
 examples/tidal-repl/index.html | 7 +++++--
 packages/tidal/package.json    | 3 ++-
 packages/tidal/tidal.mjs       | 1 +
 pnpm-lock.yaml                 | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/examples/tidal-repl/index.html b/examples/tidal-repl/index.html
index 0d17855e..25dc693e 100644
--- a/examples/tidal-repl/index.html
+++ b/examples/tidal-repl/index.html
@@ -23,7 +23,10 @@
   
     
     

-    
+    
   
 
diff --git a/packages/tidal/package.json b/packages/tidal/package.json
index 772f5f4d..7db0a82d 100644
--- a/packages/tidal/package.json
+++ b/packages/tidal/package.json
@@ -18,7 +18,8 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel/tree/main/packages/hs2js",
   "dependencies": {
-    "hs2js": "workspace:*"
+    "hs2js": "workspace:*",
+    "@strudel/core": "workspace:*"
   },
   "devDependencies": {
     "vite": "^5.0.10"
diff --git a/packages/tidal/tidal.mjs b/packages/tidal/tidal.mjs
index 60a76946..785635f7 100644
--- a/packages/tidal/tidal.mjs
+++ b/packages/tidal/tidal.mjs
@@ -1,3 +1,4 @@
+import { reify } from '@strudel/core';
 import { evaluate, loadParser } from 'hs2js';
 
 function getInfixOperators() {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7beea16b..967c1e0d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -437,6 +437,9 @@ importers:
 
   packages/tidal:
     dependencies:
+      '@strudel/core':
+        specifier: workspace:*
+        version: link:../core
       hs2js:
         specifier: workspace:*
         version: link:../hs2js

From b4f1cedc20514ffe4d3473b4dba9ae70988d1e5c Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:44:44 +0200
Subject: [PATCH 27/47] update readme after making it sync

---
 packages/hs2js/README.md | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/hs2js/README.md b/packages/hs2js/README.md
index f4059ff0..24d9c774 100644
--- a/packages/hs2js/README.md
+++ b/packages/hs2js/README.md
@@ -15,10 +15,11 @@ You can load the library directly from a script tag via unpkg:
 
 
 ```
 
@@ -66,11 +67,11 @@ Example:
 
 ```js
 // simple
-hs2js.evaluate(`2 + 2`).then(console.log) // log 4
+hs2js.evaluate(`2 + 2`) // = 4
 // passing variables via scope:
-hs2js.evaluate(`a + b`, { a: 1, b: 2 }).then(console.log); // logs 3
+hs2js.evaluate(`a + b`, { a: 1, b: 2 }) // = 3
 // custom operator
-hs2js.evaluate(`2 |* 3`, {}, { '|*': (l, r) => l * r }).then(console.log); // logs 6
+hs2js.evaluate(`2 |* 3`, {}, { '|*': (l, r) => l * r }) // = 6
 ```
 
 ### parse
@@ -80,7 +81,8 @@ hs2js.evaluate(`2 |* 3`, {}, { '|*': (l, r) => l * r }).then(console.log); // lo
 Example:
 
 ```js
-hs2js.parse(`2 + 2`).then(ast=>console.log(ast.toString()))
+const ast = hs2js.parse(`2 + 2`)
+console.log(ast.toString())
 // (haskell declarations: (declarations (top_splice (apply function: (variable) argument: (literal (integer))))))
 ```
 
@@ -95,21 +97,18 @@ Evaluates `rootNode` of haskell AST (used by evaluate internally).
 Example:
 
 ```js
-async function main() {
-  const ast = await hs2js.parse(`2 + 3`);
-  const res = hs2js.run(ast.rootNode);
-  console.log(res);
-}
-main(); // logs 5
+const ast = hs2js.parse(`2 + 3`);
+const res = hs2js.run(ast.rootNode);
+console.log(res); // = 5
 ```
 
 ### loadParser
 
 Loads and caches the parser by fetching `tree-sitter.wasm` and `tree-sitter-haskell.wasm`.
-This function is called internally by `parse` but calling it yourself might make the parser be ready faster, depending on your application.
+Make sure to call and await this function before calling `parse` or `evaluate`.
 
 ```js
-hs2js.loadParser().then(() => console.log('parser loaded'))
+hs2js.loadParser().then(() => hs2js.evaluate('alert "ready"'))
 ```
 
 ### setBase

From d132344d1110d1e0248574f7272147a5b21732c3 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:48:11 +0200
Subject: [PATCH 28/47] bump

---
 packages/hs2js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hs2js/package.json b/packages/hs2js/package.json
index 1d3907b1..56ad995f 100644
--- a/packages/hs2js/package.json
+++ b/packages/hs2js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hs2js",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Experimental Haskell in JavaScript interpreter",
   "main": "src/index.mjs",
   "type": "module",

From 71f8c0745c9c6a0870c52ae37fdd97c92a35d085 Mon Sep 17 00:00:00 2001
From: Felix Roos 
Date: Fri, 17 May 2024 20:51:43 +0200
Subject: [PATCH 29/47] update examples after making hs2js sync

---
 examples/buildless/tidal.html | 10 ++++++----
 examples/tidal-repl/main.js   |  7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/buildless/tidal.html b/examples/buildless/tidal.html
index 459ad0ed..16416b56 100644
--- a/examples/buildless/tidal.html
+++ b/examples/buildless/tidal.html
@@ -8,12 +8,13 @@
   
     
     

-    
-    
+    
+