diff --git a/package.json b/package.json index d18291eb2..5e634acd8 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "homepage": "https://strudel.cc", "dependencies": { "@strudel/core": "workspace:*", + "@strudel/cyclist": "workspace:*", "@strudel/mini": "workspace:*", "@strudel/tonal": "workspace:*", "@strudel/transpiler": "workspace:*", @@ -74,4 +75,4 @@ "vitest": "^3.0.4", "vite-plugin-bundle-audioworklet": "workspace:*" } -} \ No newline at end of file +} diff --git a/packages/codemirror/codemirror.mjs b/packages/codemirror/codemirror.mjs index 37d7ea18d..35bdf0376 100644 --- a/packages/codemirror/codemirror.mjs +++ b/packages/codemirror/codemirror.mjs @@ -42,9 +42,9 @@ const extensions = { isMultiCursorEnabled: (on) => on ? [ - EditorState.allowMultipleSelections.of(true), - EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey), - ] + EditorState.allowMultipleSelections.of(true), + EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey), + ] : [], }; const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()])); diff --git a/packages/cyclist/index.mjs b/packages/cyclist/index.mjs index 4ca3598cf..4af77d5d3 100644 --- a/packages/cyclist/index.mjs +++ b/packages/cyclist/index.mjs @@ -1,8 +1,8 @@ -export * from './speak.mjs' -export * from './evaluate.mjs' -export * from './repl.mjs' -export * from './cyclist.mjs' -export * from './time.mjs' -export * from './ui.mjs' -import createClock from './zyklus.mjs' +export * from './speak.mjs'; +export * from './evaluate.mjs'; +export * from './repl.mjs'; +export * from './cyclist.mjs'; +export * from './time.mjs'; +export * from './ui.mjs'; +import createClock from './zyklus.mjs'; export { createClock }; diff --git a/packages/cyclist/repl.mjs b/packages/cyclist/repl.mjs index 3b54ef2d7..49c0641d2 100644 --- a/packages/cyclist/repl.mjs +++ b/packages/cyclist/repl.mjs @@ -244,18 +244,18 @@ export function repl({ export const getTrigger = ({ getTime, defaultOutput }) => - async (hap, deadline, duration, cps, t) => { - // ^ this signature is different from hap.context.onTrigger, as set by Pattern.onTrigger(onTrigger) - // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004 - try { - if (!hap.context.onTrigger || !hap.context.dominantTrigger) { - await defaultOutput(hap, deadline, duration, cps, t); - } - if (hap.context.onTrigger) { - // call signature of output / onTrigger is different... - await hap.context.onTrigger(hap, getTime(), cps, t); - } - } catch (err) { - logger(`[cyclist] error: ${err.message}`, 'error'); + async (hap, deadline, duration, cps, t) => { + // ^ this signature is different from hap.context.onTrigger, as set by Pattern.onTrigger(onTrigger) + // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004 + try { + if (!hap.context.onTrigger || !hap.context.dominantTrigger) { + await defaultOutput(hap, deadline, duration, cps, t); } - }; + if (hap.context.onTrigger) { + // call signature of output / onTrigger is different... + await hap.context.onTrigger(hap, getTime(), cps, t); + } + } catch (err) { + logger(`[cyclist] error: ${err.message}`, 'error'); + } + }; diff --git a/packages/mondough/mondough.mjs b/packages/mondough/mondough.mjs index 26b45cc85..82471bdb6 100644 --- a/packages/mondough/mondough.mjs +++ b/packages/mondough/mondough.mjs @@ -1,16 +1,4 @@ -import { - reify, - fast, - slow, - seq, - stepcat, - extend, - expand, - pace, - chooseIn, - degradeBy, - silence, -} from '@strudel/core'; +import { reify, fast, slow, seq, stepcat, extend, expand, pace, chooseIn, degradeBy, silence } from '@strudel/core'; import { strudelScope } from '@strudel/cyclist'; import { registerLanguage } from '@strudel/transpiler'; import { MondoRunner } from 'mondolang'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3630886e5..177c77a45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@strudel/core': specifier: workspace:* version: link:packages/core + '@strudel/cyclist': + specifier: workspace:* + version: link:packages/cyclist '@strudel/mini': specifier: workspace:* version: link:packages/mini diff --git a/test/runtime.mjs b/test/runtime.mjs index 2a29de3f5..b4e4eb517 100644 --- a/test/runtime.mjs +++ b/test/runtime.mjs @@ -4,7 +4,7 @@ // import * as tunes from './tunes.mjs'; import { evaluate } from '@strudel/transpiler'; -import { evalScope } from '@strudel/core'; +import { evalScope } from '@strudel/cyclist'; import * as strudel from '@strudel/core'; import * as webaudio from '@strudel/webaudio'; // import gist from '@strudel/core/gist.js';