fix up imports from core, and remove circular deps that were breaking everything

packages/core/draw.mjs

@@ -4,8 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import core from './index.mjs';
-const { Pattern } = core;
+import pattern from './pattern.mjs';
+const Pattern = pattern.Pattern;
 
 export const getDrawContext = (id = 'test-canvas') => {
   let canvas = document.querySelector('#' + id);

packages/core/evaluate.mjs

@@ -4,8 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import core from './index.mjs';
-const { isPattern, Pattern } = core;
+import pattern from './pattern.mjs';
+const { isPattern, Pattern } = pattern;
 
 let scoped = false;
 export const evalScope = async (...args) => {

packages/core/index.mjs

@@ -28,8 +28,8 @@ import * as timespan from './timespan.mjs';
 import * as ui from './ui.mjs';
 import * as util from './util.mjs';
 
-const core = { ...controls, ...pattern, ...draw, ...euclid,
-	       ...evaluate, ...hap, ...logger, ...repl, ...pianoroll, ...signal, ...speak,
+const core = { drawLine, gist, logger, Fraction, ...controls, ...pattern, ...draw, ...euclid,
+	       ...evaluate, ...hap, ...repl, ...pianoroll, ...signal, ...speak,
 	       ...state, ...time, ...timespan, ...ui, ...util
 	     };
 export default core;

packages/core/pianoroll.mjs

@@ -4,8 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import core from './index.mjs';
-const { Pattern } = core;
+import pattern from './pattern.mjs';
+const { Pattern } = pattern;
 
 const scale = (normalized, min, max) => normalized * (max - min) + min;
 const getValue = (e) => {

packages/core/speak.mjs

@@ -4,8 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import core from './index.mjs';
-const {Pattern, patternify2} = core;
+import pattern from './pattern.mjs';
+const {Pattern, patternify2} = pattern;
 
 let synth;
 try {

packages/eval/evaluate.mjs

@@ -4,9 +4,9 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { evaluate as _evaluate } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
 import shapeshifter from './shapeshifter.mjs';
 
 export const evaluate = async (code) => {
-  return _evaluate(code, shapeshifter);
+  return core.evaluate(code, shapeshifter);
 };

packages/eval/shapeshifter.mjs

@@ -21,9 +21,9 @@ import {
 import shiftCodegen from 'shift-codegen';
 const codegen = shiftCodegen.default || shiftCodegen; // parcel module resolution fuckup
 
-import * as strudel from '@strudel.cycles/core';
+import strudel from '@strudel.cycles/core';
 
-const { Pattern } = strudel.pattern;
+const { Pattern } = strudel;
 
 const isNote = (name) => /^[a-gC-G][bs]?[0-9]$/.test(name);
 

packages/eval/test/evaluate.test.mjs

@@ -8,12 +8,11 @@ import { expect, describe, it } from 'vitest';
 
 import { evaluate } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
-import * as strudel from '@strudel.cycles/core';
-const { pattern, evalScope } = strudel;
-const { fastcat } = pattern;
+import strudel from '@strudel.cycles/core';
+const { fastcat, evalScope } = strudel;
 
 describe('evaluate', async () => {
-  await evalScope({ mini }, strudel, pattern);
+  await evalScope({ mini }, strudel);
   const ev = async (code) => (await evaluate(code)).pattern.firstCycleValues;
   it('Should evaluate strudel functions', async () => {
     expect(await ev('pure("c3")')).toEqual(['c3']);

packages/mini/mini.mjs

@@ -5,10 +5,10 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as krill from './krill-parser.js';
-import {pattern, rand, chooseInWith, Fraction} from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
 // import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
 
-const { pure, Pattern, stack, slowcat, sequence, timeCat, silence, reify } = pattern;
+const { pure, Pattern, stack, slowcat, sequence, timeCat, silence, reify, rand, chooseInWith, Fraction } = core;
 
 var _seedState = 0;
 const randOffset = 0.0002;

packages/react/README.md

@@ -13,12 +13,13 @@ npm i @strudel.cycles/react
 Here is a minimal example of how to set up a MiniRepl:
 
 ```jsx
-import { evalScope, controls } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const {evalScope} = core;
 import { MiniRepl } from '@strudel.cycles/react';
 import { prebake } from '../repl/src/prebake.mjs';
 
 evalScope(
-  controls,
+  core,
   import('@strudel.cycles/core'),
   import('@strudel.cycles/tonal'),
   import('@strudel.cycles/mini'),

packages/react/dist/index.es.js

@@ -7,7 +7,7 @@ import { tags as r } from "@lezer/highlight";
 import { createTheme as Z } from "@uiw/codemirror-themes";
 import { useInView as ee } from "react-hook-inview";
 import { webaudioOutput as te, getAudioContext as re } from "@strudel.cycles/webaudio";
-import { repl as oe } from "@strudel.cycles/core";
+import oe from "@strudel.cycles/core";
 import { transpiler as ne } from "@strudel.cycles/transpiler";
 const ae = Z({
   theme: "dark",
@@ -177,7 +177,8 @@ function O({ type: e }) {
 function Ee(e) {
   return L(() => (window.addEventListener("message", e), () => window.removeEventListener("message", e)), [e]), _((t) => window.postMessage(t, "*"), []);
 }
-function we({
+const we = oe.repl;
+function ye({
   defaultOutput: e,
   interval: t,
   getTime: o,
@@ -189,8 +190,8 @@ function we({
   onEvalError: c,
   onToggle: i
 }) {
-  const m = V(() => ye(), []), [h, g] = w(), [C, N] = w(), [p, y] = w(s), [M, S] = w(), [k, D] = w(), [F, x] = w(!1), b = p !== M, { scheduler: A, evaluate: T, start: J, stop: q, pause: Q } = V(
-    () => oe({
+  const m = V(() => ke(), []), [h, g] = w(), [C, N] = w(), [p, y] = w(s), [M, S] = w(), [k, D] = w(), [F, x] = w(!1), b = p !== M, { scheduler: A, evaluate: T, start: J, stop: q, pause: Q } = V(
+    () => we({
       interval: t,
       defaultOutput: e,
       onSchedulerError: g,
@@ -243,11 +244,11 @@ function we({
     }
   };
 }
-function ye() {
+function ke() {
   return Math.floor((1 + Math.random()) * 65536).toString(16).substring(1);
 }
-const ke = () => re().currentTime;
-function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
+const _e = () => re().currentTime;
+function Te({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
   const {
     code: s,
     setCode: f,
@@ -261,10 +262,10 @@ function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
     scheduler: C,
     togglePlay: N,
     stop: p
-  } = we({
+  } = ye({
     initialCode: e,
     defaultOutput: te,
-    getTime: ke
+    getTime: _e
   }), [y, M] = w(), [S, k] = ee({
     threshold: 0.01
   }), D = H(), F = V(() => ((k || !t) && (D.current = !0), k || D.current), [k, t]);
@@ -307,14 +308,14 @@ function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
     onViewChanged: M
   })));
 }
-const Te = (e) => j(() => (window.addEventListener("keydown", e, !0), () => window.removeEventListener("keydown", e, !0)), [e]);
+const Ve = (e) => j(() => (window.addEventListener("keydown", e, !0), () => window.removeEventListener("keydown", e, !0)), [e]);
 export {
   de as CodeMirror,
-  Se as MiniRepl,
+  Te as MiniRepl,
   K as cx,
   ce as flash,
   ue as useHighlighting,
-  Te as useKeydown,
+  Ve as useKeydown,
   Ee as usePostMessage,
-  we as useStrudel
+  ye as useStrudel
 };

packages/react/examples/nano-repl/src/App.jsx

@@ -1,4 +1,5 @@
-import { evalScope, controls } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const { evalScope } = core;
 import { getAudioContext, panic, webaudioOutput } from '@strudel.cycles/webaudio';
 import { useCallback, useState } from 'react';
 import CodeMirror, { flash } from '../../../src/components/CodeMirror6';
@@ -10,8 +11,8 @@ import './style.css';
 
 // TODO: only import stuff when play is pressed?
 evalScope(
-  controls,
-  import('@strudel.cycles/core'),
+  core,
+  // import('@strudel.cycles/core'),
   // import('@strudel.cycles/tone'),
   // import('@strudel.cycles/midi'), // TODO: find out why midi loads tone.js
   import('@strudel.cycles/tonal'),

packages/react/src/App.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { MiniRepl } from './components/MiniRepl';
 import 'tailwindcss/tailwind.css';
-import { controls, evalScope } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const {controls, evalScope} = core;
 
 evalScope(
   controls,

packages/react/src/hooks/useStrudel.mjs

@@ -1,5 +1,6 @@
 import { useRef, useCallback, useEffect, useMemo, useState } from 'react';
-import { repl } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const repl  = core.repl
 import { transpiler } from '@strudel.cycles/transpiler';
 import usePostMessage from './usePostMessage.mjs';
 

packages/transpiler/index.mjs

@@ -1,5 +1,5 @@
-import { evaluate as _evaluate } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
 import { transpiler } from './transpiler.mjs';
 export * from './transpiler.mjs';
 
-export const evaluate = (code) => _evaluate(code, transpiler);
+export const evaluate = (code) => core.evaluate(code, transpiler);

packages/transpiler/transpiler.mjs

@@ -1,7 +1,8 @@
 import escodegen from 'escodegen';
 import { parse } from 'acorn';
 import { walk } from 'estree-walker';
-import { isNote } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const { isNote } = core;
 
 export function transpiler(input, options = {}) {
   const { wrapAsync = false, addReturn = true, simpleLocs = false } = options;

packages/webaudio/sampler.mjs

@@ -1,4 +1,5 @@
-import { logger } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const logger = core.logger;
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
 const loadCache = {}; // string: Promise<ArrayBuffer>

packages/webaudio/webaudio.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import strudel from '@strudel.cycles/core';
-import { fromMidi, logger, toMidi } from '@strudel.cycles/core';
+const { fromMidi, logger, toMidi } = strudel;
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import { getSampleBufferSource } from './sampler.mjs';

repl/src/Footer.jsx

@@ -1,5 +1,6 @@
 import XMarkIcon from '@heroicons/react/20/solid/XMarkIcon';
-import { logger } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
+const { logger } = core;
 import { cx } from '@strudel.cycles/react';
 import { nanoid } from 'nanoid';
 import React, { useContext, useCallback, useLayoutEffect, useRef, useState } from 'react';

repl/src/prebake.mjs

@@ -1,5 +1,5 @@
-import { pattern, toMidi } from '@strudel.cycles/core';
-const { Pattern } = pattern;
+import core from '@strudel.cycles/core';
+const { Pattern, toMidi } = core;
 import { samples } from '@strudel.cycles/webaudio';
 
 export async function prebake({ isMock = false, baseDir = '.' } = {}) {

repl/src/runtime.mjs

@@ -5,9 +5,8 @@
 // import * as tunes from './tunes.mjs';
 // import { evaluate } from '@strudel.cycles/eval';
 import { evaluate } from '@strudel.cycles/transpiler';
-import { evalScope } from '@strudel.cycles/core';
-import * as strudel from '@strudel.cycles/core';
-const { Pattern } = strudel.pattern;
+import strudel from '@strudel.cycles/core';
+const { Pattern, evalScope } = strudel;
 import * as webaudio from '@strudel.cycles/webaudio';
 import controls from '@strudel.cycles/core/controls.mjs';
 // import gist from '@strudel.cycles/core/gist.js';
@@ -157,7 +156,6 @@ const loadSoundfont = () => {};
 evalScope(
   // Tone,
   strudel,
-  strudel.pattern,
   Pattern.prototype.bootstrap(),
   toneHelpersMocked,
   uiHelpersMocked,

tutorial/MiniRepl.jsx

@@ -1,4 +1,4 @@
-import { evalScope, controls } from '@strudel.cycles/core';
+import core from '@strudel.cycles/core';
 import { MiniRepl as _MiniRepl } from '@strudel.cycles/react';
 import { samples } from '@strudel.cycles/webaudio';
 import { prebake } from '../repl/src/prebake.mjs';
@@ -7,9 +7,9 @@ fetch('https://strudel.tidalcycles.org/EmuSP12.json')
   .then((res) => res.json())
   .then((json) => samples(json, 'https://strudel.tidalcycles.org/EmuSP12/'));
 
-evalScope(
-  controls,
-  import('@strudel.cycles/core'),
+core.evalScope(
+  core,
+  // import('@strudel.cycles/core'),
   // import('@strudel.cycles/tone'),
   import('@strudel.cycles/tonal'),
   import('@strudel.cycles/mini'),