diff --git a/packages/core/util.mjs b/packages/core/util.mjs index 9747645b5..76c61450f 100644 --- a/packages/core/util.mjs +++ b/packages/core/util.mjs @@ -34,6 +34,13 @@ export const fromMidi = (n) => { return Math.pow(2, (n - 69) / 12) * 440; }; +export const getFreq = (noteOrMidi) => { + if (typeof noteOrMidi === 'number') { + return fromMidi(noteOrMidi); + } + return fromMidi(toMidi(noteOrMidi)); +}; + export const midi2note = (n) => { const oct = Math.floor(n / 12) - 1; const pc = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'][n % 12]; diff --git a/packages/react/dist/index.cjs.js b/packages/react/dist/index.cjs.js index ca9f476a2..cc794f541 100644 --- a/packages/react/dist/index.cjs.js +++ b/packages/react/dist/index.cjs.js @@ -1,3 +1,3 @@ -"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var t=require("react"),se=require("react-codemirror6"),C=require("@codemirror/view"),W=require("@codemirror/state"),ce=require("@codemirror/lang-javascript"),c=require("@codemirror/highlight"),le=require("react-hook-inview"),ie=require("@strudel.cycles/eval"),ue=require("@strudel.cycles/core/util.mjs"),b=require("@strudel.cycles/tone"),Q=require("@strudel.cycles/core"),y=require("@strudel.cycles/midi");function de(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}var d=de(t);const fe="#abb2bf",ge="#7d8799",me="#ffffff",pe="#21252b",P="rgba(0, 0, 0, 0.5)",be="transparent",L="#353a42",he="rgba(128, 203, 196, 0.5)",U="#ffcc00",ve=C.EditorView.theme({"&":{color:"#ffffff",backgroundColor:be,fontSize:"15px","z-index":11},".cm-content":{caretColor:U,lineHeight:"22px"},".cm-line":{background:"#2C323699"},"&.cm-focused .cm-cursor":{backgroundColor:U,width:"3px"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:he},".cm-panels":{backgroundColor:pe,color:"#ffffff"},".cm-panels.cm-panels-top":{borderBottom:"2px solid black"},".cm-panels.cm-panels-bottom":{borderTop:"2px solid black"},".cm-searchMatch":{backgroundColor:"#72a1ff59",outline:"1px solid #457dff"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"#6199ff2f"},".cm-activeLine":{backgroundColor:P},".cm-selectionMatch":{backgroundColor:"#aafe661a"},"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket":{backgroundColor:"#bad0f847",outline:"1px solid #515a6b"},".cm-gutters":{background:"transparent",color:"#676e95",border:"none"},".cm-activeLineGutter":{backgroundColor:P},".cm-foldPlaceholder":{backgroundColor:"transparent",border:"none",color:"#ddd"},".cm-tooltip":{border:"none",backgroundColor:L},".cm-tooltip .cm-tooltip-arrow:before":{borderTopColor:"transparent",borderBottomColor:"transparent"},".cm-tooltip .cm-tooltip-arrow:after":{borderTopColor:L,borderBottomColor:L},".cm-tooltip-autocomplete":{"& > ul > li[aria-selected]":{backgroundColor:P,color:fe}}},{dark:!0}),ye=c.HighlightStyle.define([{tag:c.tags.keyword,color:"#c792ea"},{tag:c.tags.operator,color:"#89ddff"},{tag:c.tags.special(c.tags.variableName),color:"#eeffff"},{tag:c.tags.typeName,color:"#f07178"},{tag:c.tags.atom,color:"#f78c6c"},{tag:c.tags.number,color:"#ff5370"},{tag:c.tags.definition(c.tags.variableName),color:"#82aaff"},{tag:c.tags.string,color:"#c3e88d"},{tag:c.tags.special(c.tags.string),color:"#f07178"},{tag:c.tags.comment,color:ge},{tag:c.tags.variableName,color:"#f07178"},{tag:c.tags.tagName,color:"#ff5370"},{tag:c.tags.bracket,color:"#a2a1a4"},{tag:c.tags.meta,color:"#ffcb6b"},{tag:c.tags.attributeName,color:"#c792ea"},{tag:c.tags.propertyName,color:"#c792ea"},{tag:c.tags.className,color:"#decb6b"},{tag:c.tags.invalid,color:me}]),Ce=[ve,ye],O=W.StateEffect.define(),ke=W.StateField.define({create(){return C.Decoration.none},update(e,o){try{for(let a of o.effects)if(a.is(O))if(a.value){const u=C.Decoration.mark({attributes:{style:"background-color: #FFCA2880"}});e=C.Decoration.set([u.range(0,o.newDoc.length)])}else e=C.Decoration.set([]);return e}catch(a){return console.warn("flash error",a),e}},provide:e=>C.EditorView.decorations.from(e)}),we=e=>{e.dispatch({effects:O.of(!0)}),setTimeout(()=>{e.dispatch({effects:O.of(!1)})},200)},F=W.StateEffect.define(),Me=W.StateField.define({create(){return C.Decoration.none},update(e,o){try{for(let a of o.effects)a.is(F)&&(e=C.Decoration.set(a.value.flatMap(u=>(u.context.locations||[]).map(({start:g,end:l})=>{const i=u.context.color||"#FFCA28";let m=o.newDoc.line(g.line).from+g.column,s=o.newDoc.line(l.line).from+l.column;const r=o.newDoc.length;return m>r||s>r?void 0:C.Decoration.mark({attributes:{style:`outline: 1px solid ${i}`}}).range(m,s)})).filter(Boolean),!0));return e}catch{return e}},provide:e=>C.EditorView.decorations.from(e)});function J({value:e,onChange:o,onViewChanged:a,onCursor:u,options:g,editorDidMount:l,theme:i}){return d.default.createElement(d.default.Fragment,null,d.default.createElement(se.CodeMirror,{onViewChange:a,style:{display:"flex",flexDirection:"column",flex:"1 0 auto"},value:e,onChange:o,extensions:[ce.javascript(),i||Ce,Me,ke]}))}function K(e){const{onEvent:o,onQuery:a,onSchedule:u,ready:g=!0,onDraw:l}=e,[i,m]=t.useState(!1),s=1,r=()=>Math.floor(b.Tone.getTransport().seconds/s),T=(h=r())=>{const S=new Q.TimeSpan(h,h+1),q=a?.(new Q.State(S))||[];u?.(q,h);const H=S.begin.valueOf();b.Tone.getTransport().cancel(H);const x=(h+1)*s-.5,R=Math.max(b.Tone.getTransport().seconds,x)+.1;b.Tone.getTransport().schedule(()=>{T(h+1)},R),q?.filter(p=>p.part.begin.equals(p.whole?.begin)).forEach(p=>{b.Tone.getTransport().schedule(v=>{o(v,p,b.Tone.getContext().currentTime),b.Tone.Draw.schedule(()=>{l?.(v,p)},v)},p.part.begin.valueOf())})};t.useEffect(()=>{g&&T()},[o,u,a,l,g]);const N=async()=>{m(!0),await b.Tone.start(),b.Tone.getTransport().start("+0.1")},k=(h=!1)=>{h?(b.Tone.getTransport().cancel(),b.Tone.getTransport().stop()):b.Tone.getTransport().pause(),m(!1)};return{start:N,stop:k,onEvent:o,started:i,setStarted:m,toggle:()=>i?k():N(),query:T,activeCycle:r}}function X(e){return t.useEffect(()=>(window.addEventListener("message",e),()=>window.removeEventListener("message",e)),[e]),t.useCallback(o=>window.postMessage(o,"*"),[])}let Ee=()=>Math.floor((1+Math.random())*65536).toString(16).substring(1);const Te=e=>encodeURIComponent(btoa(e));function Y({tune:e,defaultSynth:o,autolink:a=!0,onEvent:u,onDraw:g}){const l=t.useMemo(()=>Ee(),[]),[i,m]=t.useState(e),[s,r]=t.useState(),[T,N]=t.useState(""),[k,w]=t.useState(),[h,S]=t.useState(!1),[q,H]=t.useState(""),[x,R]=t.useState(),p=t.useMemo(()=>i!==s||k,[i,s,k]),v=t.useCallback(f=>N(n=>n+`${n?` +"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});var t=require("react"),ce=require("react-codemirror6"),k=require("@codemirror/view"),W=require("@codemirror/state"),le=require("@codemirror/lang-javascript"),l=require("@codemirror/highlight"),ie=require("react-hook-inview"),ue=require("@strudel.cycles/eval"),de=require("@strudel.cycles/core/util.mjs"),b=require("@strudel.cycles/tone"),Q=require("@strudel.cycles/core"),C=require("@strudel.cycles/midi");function fe(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}var d=fe(t);const ge="#abb2bf",me="#7d8799",pe="#ffffff",be="#21252b",j="rgba(0, 0, 0, 0.5)",he="transparent",O="#353a42",ve="rgba(128, 203, 196, 0.5)",U="#ffcc00",ye=k.EditorView.theme({"&":{color:"#ffffff",backgroundColor:he,fontSize:"15px","z-index":11},".cm-content":{caretColor:U,lineHeight:"22px"},".cm-line":{background:"#2C323699"},"&.cm-focused .cm-cursor":{backgroundColor:U,width:"3px"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:ve},".cm-panels":{backgroundColor:be,color:"#ffffff"},".cm-panels.cm-panels-top":{borderBottom:"2px solid black"},".cm-panels.cm-panels-bottom":{borderTop:"2px solid black"},".cm-searchMatch":{backgroundColor:"#72a1ff59",outline:"1px solid #457dff"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"#6199ff2f"},".cm-activeLine":{backgroundColor:j},".cm-selectionMatch":{backgroundColor:"#aafe661a"},"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket":{backgroundColor:"#bad0f847",outline:"1px solid #515a6b"},".cm-gutters":{background:"transparent",color:"#676e95",border:"none"},".cm-activeLineGutter":{backgroundColor:j},".cm-foldPlaceholder":{backgroundColor:"transparent",border:"none",color:"#ddd"},".cm-tooltip":{border:"none",backgroundColor:O},".cm-tooltip .cm-tooltip-arrow:before":{borderTopColor:"transparent",borderBottomColor:"transparent"},".cm-tooltip .cm-tooltip-arrow:after":{borderTopColor:O,borderBottomColor:O},".cm-tooltip-autocomplete":{"& > ul > li[aria-selected]":{backgroundColor:j,color:ge}}},{dark:!0}),we=l.HighlightStyle.define([{tag:l.tags.keyword,color:"#c792ea"},{tag:l.tags.operator,color:"#89ddff"},{tag:l.tags.special(l.tags.variableName),color:"#eeffff"},{tag:l.tags.typeName,color:"#f07178"},{tag:l.tags.atom,color:"#f78c6c"},{tag:l.tags.number,color:"#ff5370"},{tag:l.tags.definition(l.tags.variableName),color:"#82aaff"},{tag:l.tags.string,color:"#c3e88d"},{tag:l.tags.special(l.tags.string),color:"#f07178"},{tag:l.tags.comment,color:me},{tag:l.tags.variableName,color:"#f07178"},{tag:l.tags.tagName,color:"#ff5370"},{tag:l.tags.bracket,color:"#a2a1a4"},{tag:l.tags.meta,color:"#ffcb6b"},{tag:l.tags.attributeName,color:"#c792ea"},{tag:l.tags.propertyName,color:"#c792ea"},{tag:l.tags.className,color:"#decb6b"},{tag:l.tags.invalid,color:pe}]),Ce=[ye,we],$=W.StateEffect.define(),ke=W.StateField.define({create(){return k.Decoration.none},update(e,o){try{for(let r of o.effects)if(r.is($))if(r.value){const u=k.Decoration.mark({attributes:{style:"background-color: #FFCA2880"}});e=k.Decoration.set([u.range(0,o.newDoc.length)])}else e=k.Decoration.set([]);return e}catch(r){return console.warn("flash error",r),e}},provide:e=>k.EditorView.decorations.from(e)}),J=e=>{e.dispatch({effects:$.of(!0)}),setTimeout(()=>{e.dispatch({effects:$.of(!1)})},200)},P=W.StateEffect.define(),Me=W.StateField.define({create(){return k.Decoration.none},update(e,o){try{for(let r of o.effects)r.is(P)&&(e=k.Decoration.set(r.value.flatMap(u=>(u.context.locations||[]).map(({start:g,end:i})=>{const c=u.context.color||"#FFCA28";let m=o.newDoc.line(g.line).from+g.column,s=o.newDoc.line(i.line).from+i.column;const a=o.newDoc.length;return m>a||s>a?void 0:k.Decoration.mark({attributes:{style:`outline: 1px solid ${c}`}}).range(m,s)})).filter(Boolean),!0));return e}catch{return e}},provide:e=>k.EditorView.decorations.from(e)});function X({value:e,onChange:o,onViewChanged:r,onCursor:u,options:g,editorDidMount:i,theme:c}){return d.default.createElement(d.default.Fragment,null,d.default.createElement(ce.CodeMirror,{onViewChange:r,style:{display:"flex",flexDirection:"column",flex:"1 0 auto"},value:e,onChange:o,extensions:[le.javascript(),c||Ce,Me,ke]}))}function Y(e){const{onEvent:o,onQuery:r,onSchedule:u,ready:g=!0,onDraw:i}=e,[c,m]=t.useState(!1),s=1,a=()=>Math.floor(b.Tone.getTransport().seconds/s),x=(p=a())=>{const N=new Q.TimeSpan(p,p+1),R=r?.(new Q.State(N))||[];u?.(R,p);const F=N.begin.valueOf();b.Tone.getTransport().cancel(F);const w=(p+1)*s-.5,B=Math.max(b.Tone.getTransport().seconds,w)+.1;b.Tone.getTransport().schedule(()=>{x(p+1)},B),R?.filter(h=>h.part.begin.equals(h.whole?.begin)).forEach(h=>{b.Tone.getTransport().schedule(v=>{o(v,h,b.Tone.getContext().currentTime),b.Tone.Draw.schedule(()=>{i?.(v,h)},v)},h.part.begin.valueOf())})};t.useEffect(()=>{g&&x()},[o,u,r,i,g]);const _=async()=>{m(!0),await b.Tone.start(),b.Tone.getTransport().start("+0.1")},S=(p=!1)=>{p?(b.Tone.getTransport().cancel(),b.Tone.getTransport().stop()):b.Tone.getTransport().pause(),m(!1)};return{start:_,stop:S,onEvent:o,started:c,setStarted:m,toggle:()=>c?S():_(),query:x,activeCycle:a}}function Z(e){return t.useEffect(()=>(window.addEventListener("message",e),()=>window.removeEventListener("message",e)),[e]),t.useCallback(o=>window.postMessage(o,"*"),[])}let Ee=()=>Math.floor((1+Math.random())*65536).toString(16).substring(1);const Te=e=>encodeURIComponent(btoa(e));function ee({tune:e,defaultSynth:o,autolink:r=!0,onEvent:u,onDraw:g}){const i=t.useMemo(()=>Ee(),[]),[c,m]=t.useState(e),[s,a]=t.useState(),[x,_]=t.useState(""),[S,D]=t.useState(),[p,N]=t.useState(!1),[R,F]=t.useState(""),[w,B]=t.useState(),h=t.useMemo(()=>c!==s||S,[c,s,S]),v=t.useCallback(f=>_(n=>n+`${n?` -`:""}${f}`),[]),z=t.useMemo(()=>{if(s&&!s.includes("strudel disable-highlighting"))return(f,n)=>g?.(f,n,s)},[s,g]),ee=t.useMemo(()=>s&&s.includes("strudel hide-header"),[s]),_=K({onDraw:z,onEvent:t.useCallback((f,n,M)=>{try{u?.(f,n,M),n.context.logs?.length&&n.context.logs.forEach(v);const{onTrigger:D,velocity:re}=n.context;if(D)D(f,n,M,1);else if(o){const ne=ue.getPlayableNoteValue(n);o.triggerAttackRelease(ne,n.duration.valueOf(),f,re)}else if(!u)throw new Error("no defaultSynth nor onEvent passed to useRepl + event has no onTrigger. nothing happens")}catch(D){console.warn(D),D.message="unplayable event: "+D?.message,v(D.message)}},[u,v,o]),onQuery:t.useCallback(f=>{try{return x?.query(f)||[]}catch(n){return console.warn(n),n.message="query error: "+n.message,w(n),[]}},[x]),onSchedule:t.useCallback((f,n)=>te(f,n),[]),ready:!!x&&!!s}),I=X(({data:{from:f,type:n}})=>{n==="start"&&f!==l&&(_.setStarted(!1),r(void 0))}),A=t.useCallback(async(f=i,n=!1)=>{if(s&&!p){w(void 0),!n&&_.start();return}try{S(!0);const M=await ie.evaluate(f);!n&&_.start(),I({type:"start",from:l}),R(()=>M.pattern),a&&(window.location.hash="#"+encodeURIComponent(btoa(i))),H(Te(i)),w(void 0),r(f),S(!1)}catch(M){M.message="evaluation error: "+M.message,console.warn(M),w(M)}},[s,p,i,_,a,l,I]),te=(f,n)=>{f.length},oe=()=>{_.started?_.stop():A()},$=()=>{_.stop(!0),r(void 0)},ae=()=>{A(i,!0)};return t.useEffect(()=>()=>$(),[]),{hideHeader:ee,pending:h,code:i,setCode:m,pattern:x,error:k,cycle:_,setPattern:R,dirty:p,log:T,togglePlay:oe,stop:$,setActiveCode:r,activateCode:A,evaluateOnly:ae,activeCode:s,pushLog:v,hash:q}}function V(...e){return e.filter(Boolean).join(" ")}let B=[],G;function Z({view:e,pattern:o,active:a}){t.useEffect(()=>{if(e)if(o&&a){let g=function(){try{const l=b.Tone.getTransport().seconds,m=[Math.max(G||l,l-1/10),l+1/60];G=l+1/60,B=B.filter(r=>r.whole.end>l);const s=o.queryArc(...m).filter(r=>r.hasOnset());B=B.concat(s),e.dispatch({effects:F.of(B)})}catch{e.dispatch({effects:F.of([])})}u=requestAnimationFrame(g)},u=requestAnimationFrame(g);return()=>{cancelAnimationFrame(u)}}else B=[],e.dispatch({effects:F.of([])})},[o,a,e])}const xe="_container_10e1g_1",_e="_header_10e1g_5",Se="_buttons_10e1g_9",De="_button_10e1g_9",Ne="_buttonDisabled_10e1g_17",qe="_error_10e1g_21",Re="_body_10e1g_25";var E={container:xe,header:_e,buttons:Se,button:De,buttonDisabled:Ne,error:qe,body:Re};function j({type:e}){return d.default.createElement("svg",{xmlns:"http://www.w3.org/2000/svg",className:"sc-h-5 sc-w-5",viewBox:"0 0 20 20",fill:"currentColor"},{refresh:d.default.createElement("path",{fillRule:"evenodd",d:"M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z",clipRule:"evenodd"}),play:d.default.createElement("path",{fillRule:"evenodd",d:"M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z",clipRule:"evenodd"}),pause:d.default.createElement("path",{fillRule:"evenodd",d:"M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z",clipRule:"evenodd"}),stop:d.default.createElement("path",{fillRule:"evenodd",d:"M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V8a1 1 0 00-1-1H8z",clipRule:"evenodd"})}[e])}function Be({tune:e,defaultSynth:o,hideOutsideView:a=!1,theme:u,init:g,onEvent:l}){const{code:i,setCode:m,pattern:s,activeCode:r,activateCode:T,evaluateOnly:N,error:k,cycle:w,dirty:h,togglePlay:S,stop:q}=Y({tune:e,defaultSynth:o,autolink:!1,onEvent:l});t.useEffect(()=>{g&&N()},[e,g]);const[H,x]=t.useState(),[R,p]=le.useInView({threshold:.01}),v=t.useRef(),z=t.useMemo(()=>((p||!a)&&(v.current=!0),p||v.current),[p,a]);return Z({view:H,pattern:s,active:w.started&&!r?.includes("strudel disable-highlighting")}),d.default.createElement("div",{className:E.container,ref:R},d.default.createElement("div",{className:E.header},d.default.createElement("div",{className:E.buttons},d.default.createElement("button",{className:V(E.button,w.started?"sc-animate-pulse":""),onClick:()=>S()},d.default.createElement(j,{type:w.started?"pause":"play"})),d.default.createElement("button",{className:V(h?E.button:E.buttonDisabled),onClick:()=>T()},d.default.createElement(j,{type:"refresh"})),d.default.createElement("button",{className:V(E.button),onClick:()=>q(!0)},d.default.createElement(j,{type:"stop"}))),k&&d.default.createElement("div",{className:E.error},k.message)),d.default.createElement("div",{className:E.body},z&&d.default.createElement(J,{theme:u,value:i,onChange:m,onViewChanged:x})))}function He(e){const{ready:o,connected:a,disconnected:u}=e,[g,l]=t.useState(!0),[i,m]=t.useState(y.WebMidi?.outputs||[]);return t.useEffect(()=>{y.enableWebMidi().then(()=>{y.WebMidi.addListener("connected",r=>{m([...y.WebMidi.outputs]),a?.(y.WebMidi,r)}),y.WebMidi.addListener("disconnected",r=>{m([...y.WebMidi.outputs]),u?.(y.WebMidi,r)}),o?.(y.WebMidi),l(!1)}).catch(r=>{if(r){console.error(r),console.warn("Web Midi could not be enabled..");return}})},[o,a,u,i]),{loading:g,outputs:i,outputByName:r=>y.WebMidi.getOutputByName(r)}}exports.CodeMirror=J;exports.MiniRepl=Be;exports.cx=V;exports.flash=we;exports.useCycle=K;exports.useHighlighting=Z;exports.usePostMessage=X;exports.useRepl=Y;exports.useWebMidi=He; +`:""}${f}`),[]),L=t.useMemo(()=>{if(s&&!s.includes("strudel disable-highlighting"))return(f,n)=>g?.(f,n,s)},[s,g]),z=t.useMemo(()=>s&&s.includes("strudel hide-header"),[s]),y=Y({onDraw:L,onEvent:t.useCallback((f,n,E)=>{try{u?.(f,n,E),n.context.logs?.length&&n.context.logs.forEach(v);const{onTrigger:q,velocity:ne}=n.context;if(q)q(f,n,E,1);else if(o){const se=de.getPlayableNoteValue(n);o.triggerAttackRelease(se,n.duration.valueOf(),f,ne)}else if(!u)throw new Error("no defaultSynth nor onEvent passed to useRepl + event has no onTrigger. nothing happens")}catch(q){console.warn(q),q.message="unplayable event: "+q?.message,v(q.message)}},[u,v,o]),onQuery:t.useCallback(f=>{try{return w?.query(f)||[]}catch(n){return console.warn(n),n.message="query error: "+n.message,D(n),[]}},[w]),onSchedule:t.useCallback((f,n)=>oe(f,n),[]),ready:!!w&&!!s}),M=Z(({data:{from:f,type:n}})=>{n==="start"&&f!==i&&(y.setStarted(!1),a(void 0))}),A=t.useCallback(async(f=c,n=!1)=>{if(s&&!h){D(void 0),!n&&y.start();return}try{N(!0);const E=await ue.evaluate(f);!n&&y.start(),M({type:"start",from:i}),B(()=>E.pattern),r&&(window.location.hash="#"+encodeURIComponent(btoa(c))),F(Te(c)),D(void 0),a(f),N(!1)}catch(E){E.message="evaluation error: "+E.message,console.warn(E),D(E)}},[s,h,c,y,r,i,M]),oe=(f,n)=>{f.length},ae=()=>{y.started?y.stop():A()},K=()=>{y.stop(!0),a(void 0)},re=()=>{A(c,!0)};return t.useEffect(()=>()=>K(),[]),{hideHeader:z,pending:p,code:c,setCode:m,pattern:w,error:S,cycle:y,setPattern:B,dirty:h,log:x,togglePlay:ae,stop:K,setActiveCode:a,activateCode:A,evaluateOnly:re,activeCode:s,pushLog:v,hash:R}}function V(...e){return e.filter(Boolean).join(" ")}let H=[],G;function te({view:e,pattern:o,active:r}){t.useEffect(()=>{if(e)if(o&&r){let g=function(){try{const i=b.Tone.getTransport().seconds,m=[Math.max(G||i,i-1/10),i+1/60];G=i+1/60,H=H.filter(a=>a.whole.end>i);const s=o.queryArc(...m).filter(a=>a.hasOnset());H=H.concat(s),e.dispatch({effects:P.of(H)})}catch{e.dispatch({effects:P.of([])})}u=requestAnimationFrame(g)},u=requestAnimationFrame(g);return()=>{cancelAnimationFrame(u)}}else H=[],e.dispatch({effects:P.of([])})},[o,r,e])}const xe="_container_10e1g_1",_e="_header_10e1g_5",Se="_buttons_10e1g_9",De="_button_10e1g_9",Ne="_buttonDisabled_10e1g_17",qe="_error_10e1g_21",Re="_body_10e1g_25";var T={container:xe,header:_e,buttons:Se,button:De,buttonDisabled:Ne,error:qe,body:Re};function I({type:e}){return d.default.createElement("svg",{xmlns:"http://www.w3.org/2000/svg",className:"sc-h-5 sc-w-5",viewBox:"0 0 20 20",fill:"currentColor"},{refresh:d.default.createElement("path",{fillRule:"evenodd",d:"M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z",clipRule:"evenodd"}),play:d.default.createElement("path",{fillRule:"evenodd",d:"M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z",clipRule:"evenodd"}),pause:d.default.createElement("path",{fillRule:"evenodd",d:"M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z",clipRule:"evenodd"}),stop:d.default.createElement("path",{fillRule:"evenodd",d:"M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V8a1 1 0 00-1-1H8z",clipRule:"evenodd"})}[e])}function Be({tune:e,defaultSynth:o,hideOutsideView:r=!1,theme:u,init:g,onEvent:i,enableKeyboard:c}){const{code:m,setCode:s,pattern:a,activeCode:x,activateCode:_,evaluateOnly:S,error:D,cycle:p,dirty:N,togglePlay:R,stop:F}=ee({tune:e,defaultSynth:o,autolink:!1,onEvent:i});t.useEffect(()=>{g&&S()},[e,g]);const[w,B]=t.useState(),[h,v]=ie.useInView({threshold:.01}),L=t.useRef(),z=t.useMemo(()=>((v||!r)&&(L.current=!0),v||L.current),[v,r]);return te({view:w,pattern:a,active:p.started&&!x?.includes("strudel disable-highlighting")}),t.useLayoutEffect(()=>{if(c){const y=async M=>{(M.ctrlKey||M.altKey)&&(M.code==="Enter"?(M.preventDefault(),console.log("flash.."),J(w),await _()):M.code==="Period"&&(p.stop(),M.preventDefault()))};return window.addEventListener("keydown",y,!0),()=>window.removeEventListener("keydown",y,!0)}},[c,a,m,_,p,w]),d.default.createElement("div",{className:T.container,ref:h},d.default.createElement("div",{className:T.header},d.default.createElement("div",{className:T.buttons},d.default.createElement("button",{className:V(T.button,p.started?"sc-animate-pulse":""),onClick:()=>R()},d.default.createElement(I,{type:p.started?"pause":"play"})),d.default.createElement("button",{className:V(N?T.button:T.buttonDisabled),onClick:()=>_()},d.default.createElement(I,{type:"refresh"})),d.default.createElement("button",{className:V(T.button),onClick:()=>F(!0)},d.default.createElement(I,{type:"stop"}))),D&&d.default.createElement("div",{className:T.error},D.message)),d.default.createElement("div",{className:T.body},z&&d.default.createElement(X,{theme:u,value:m,onChange:s,onViewChanged:B})))}function He(e){const{ready:o,connected:r,disconnected:u}=e,[g,i]=t.useState(!0),[c,m]=t.useState(C.WebMidi?.outputs||[]);return t.useEffect(()=>{C.enableWebMidi().then(()=>{C.WebMidi.addListener("connected",a=>{m([...C.WebMidi.outputs]),r?.(C.WebMidi,a)}),C.WebMidi.addListener("disconnected",a=>{m([...C.WebMidi.outputs]),u?.(C.WebMidi,a)}),o?.(C.WebMidi),i(!1)}).catch(a=>{if(a){console.error(a),console.warn("Web Midi could not be enabled..");return}})},[o,r,u,c]),{loading:g,outputs:c,outputByName:a=>C.WebMidi.getOutputByName(a)}}exports.CodeMirror=X;exports.MiniRepl=Be;exports.cx=V;exports.flash=J;exports.useCycle=Y;exports.useHighlighting=te;exports.usePostMessage=Z;exports.useRepl=ee;exports.useWebMidi=He; diff --git a/packages/react/dist/index.es.js b/packages/react/dist/index.es.js index 747eb8f87..755bdfc02 100644 --- a/packages/react/dist/index.es.js +++ b/packages/react/dist/index.es.js @@ -1,4 +1,4 @@ -import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react'; +import React, { useState, useEffect, useCallback, useMemo, useRef, useLayoutEffect } from 'react'; import { CodeMirror as CodeMirror$1 } from 'react-codemirror6'; import { EditorView, Decoration } from '@codemirror/view'; import { StateEffect, StateField } from '@codemirror/state'; @@ -592,7 +592,7 @@ function Icon({ type }) { }[type]); } -function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent }) { +function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent, enableKeyboard }) { const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } = useRepl({ tune, defaultSynth, @@ -614,6 +614,25 @@ function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, on return isVisible || wasVisible.current; }, [isVisible, hideOutsideView]); useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes("strudel disable-highlighting") }); + useLayoutEffect(() => { + if (enableKeyboard) { + const handleKeyPress = async (e) => { + if (e.ctrlKey || e.altKey) { + if (e.code === "Enter") { + e.preventDefault(); + console.log("flash.."); + flash(view); + await activateCode(); + } else if (e.code === "Period") { + cycle.stop(); + e.preventDefault(); + } + } + }; + window.addEventListener("keydown", handleKeyPress, true); + return () => window.removeEventListener("keydown", handleKeyPress, true); + } + }, [enableKeyboard, pattern, code, activateCode, cycle, view]); return /* @__PURE__ */ React.createElement("div", { className: styles.container, ref diff --git a/packages/react/src/components/MiniRepl.jsx b/packages/react/src/components/MiniRepl.jsx index 8ed53108d..0690bd098 100644 --- a/packages/react/src/components/MiniRepl.jsx +++ b/packages/react/src/components/MiniRepl.jsx @@ -1,15 +1,15 @@ -import React, { useState, useMemo, useRef, useEffect } from 'react'; +import React, { useState, useMemo, useRef, useEffect, useLayoutEffect } from 'react'; import { useInView } from 'react-hook-inview'; import useRepl from '../hooks/useRepl.mjs'; import cx from '../cx'; import useHighlighting from '../hooks/useHighlighting.mjs'; -import CodeMirror6 from './CodeMirror6'; +import CodeMirror6, { flash } from './CodeMirror6'; import 'tailwindcss/tailwind.css'; import './style.css'; import styles from './MiniRepl.module.css'; import { Icon } from './Icon'; -export function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent }) { +export function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent, enableKeyboard }) { const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } = useRepl({ tune, @@ -32,6 +32,27 @@ export function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, i return isVisible || wasVisible.current; }, [isVisible, hideOutsideView]); useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes('strudel disable-highlighting') }); + + // set active pattern on ctrl+enter + useLayoutEffect(() => { + if (enableKeyboard) { + const handleKeyPress = async (e) => { + if (e.ctrlKey || e.altKey) { + if (e.code === 'Enter') { + e.preventDefault(); + flash(view); + await activateCode(); + } else if (e.code === 'Period') { + cycle.stop(); + e.preventDefault(); + } + } + }; + window.addEventListener('keydown', handleKeyPress, true); + return () => window.removeEventListener('keydown', handleKeyPress, true); + } + }, [enableKeyboard, pattern, code, activateCode, cycle, view]); + return (
diff --git a/repl/src/prebake.mjs b/repl/src/prebake.mjs index e35f3073a..d02d4e63a 100644 --- a/repl/src/prebake.mjs +++ b/repl/src/prebake.mjs @@ -43,19 +43,6 @@ export function prebake() { ); } -const maxPan = toMidi('C8'); -const panwidth = (pan, width) => pan * width + (1 - width) / 2; - -Pattern.prototype.piano = function () { - return this.clip(1) - .s('piano') - .fmap((value) => { - // pan by pitch - const pan = panwidth(Math.min(toMidi(value.note || value.n) / maxPan, 1), 0.5); - return { ...value, pan: (value.pan || 1) * pan }; - }); -}; - samples({ jazzbass: { _base: './samples/jazzbass/moog_', @@ -93,7 +80,7 @@ samples({ c5: 'c5.mp3', }, }); - +console.log('bake...'); samples( { bd: 'bd.mp3', @@ -104,3 +91,99 @@ samples( }, './samples/president/president_', ); + +const maxPan = toMidi('C8'); +const panwidth = (pan, width) => pan * width + (1 - width) / 2; + +Pattern.prototype.panByPitch = function () { + return this.fmap((value) => { + // pan by pitch + const pan = panwidth(Math.min(toMidi(value.note || value.n) / maxPan, 1), 0.5); + return { ...value, pan: (value.pan || 1) * pan }; + }); +}; + +Pattern.prototype.piano = function () { + return this.clip(1).s('piano').panByPitch(); +}; + +Pattern.prototype.rhodes = function () { + return this.clip(1).s('stage73').panByPitch().gain(1.5); +}; + +Pattern.prototype.jazzbass = function () { + return this.clip(1).s('jazzbass'); +}; + +/* +stack( + s(" ~, ~, hh*6") + .speed(.8) + //.cutoff(2000) + .slow(2) + //.cutoff(perlin.range(500,4000)) + .sometimes(x=>x.echo("2", 1/6+0.05, .8)) + , + note( + "C^7 " + //.euclidLegato(6,12) + .voicings() + ) + .rhodes() + //.s('sawtooth') + .slow(8).gain(2) + .cutoff(2000) + , + note( + "[c2 ](5,12)".slow(4) + .transpose(12) + //.superimpose(add("<12 24>,0.05")) + ) + .s("jazzbass").clip(1).gain(1) + //.cutoff(sine.range(300,500).slow(4)) + //.resonance(10) + , + note( + "0 2 4 0".iter(4).add("<0>") + //.off(1/12, add("7")) + .off(1/6, add("14")) + .degradeBy(.2) + .scale('C5 major') + .legato(4) + .slow(2) + .echo(2, 1/6, .5) + ) + .piano() + //.s('sawtooth') + //.cutoff(1000) + //.resonance(25) + .gain(.5) +) + //.hcutoff(1000) + //.resonance(20) + .reset("") + +.out() + + +*/ + +/* +note("[c2(3,8) [ bb1]]") + .s('sawtooth') + .gain(.5) + .cutoff(sine.range(200,1200).slow(4)) + .slow(2) + .stack( + note("Cm7@3 ".voicings().slow(4)).rhodes(), + note("0 2 4 <9 8>".iter(4).scale('C5 minor')) + .degradeBy(.5).echo(4, 1/8, .8) + .legato(.05) + .rhodes() + .jux(rev), + ) + .stack(s("bd,~ sd,hh*4").cutoff(2000)) + .reset("") + .out() + .logValues() + */ diff --git a/talk/MaxiRepl.jsx b/talk/MaxiRepl.jsx index c45a64d0a..663a87530 100644 --- a/talk/MaxiRepl.jsx +++ b/talk/MaxiRepl.jsx @@ -40,6 +40,7 @@ export function MaxiRepl({ code, canvasHeight = 500 }) { useEffect(() => { init.then(() => setReady(true)); }, []); + useEffect(() => { cleanupDraw(); cleanupUi(); @@ -59,6 +60,7 @@ export function MaxiRepl({ code, canvasHeight = 500 }) {
)} <_MiniRepl + enableKeyboard={true} key={exampleIndex} tune={examples[exampleIndex]} hideOutsideView={true} diff --git a/talk/deck.mdx b/talk/deck.mdx index dac206946..0f37222e4 100644 --- a/talk/deck.mdx +++ b/talk/deck.mdx @@ -11,6 +11,10 @@ import ImgTile from './ImgTile'; ## Algorithmic Patterns for the Web +![whirlpool](./strudel_icon.png) + +Alex McLean, Felix Roos & Tidal Cycles Community +
@@ -45,6 +49,28 @@ import ImgTile from './ImgTile'; +## Strudel is.. + +
+ +
+ +- a zero-install live coding editor on the web +- based on a port of Tidal Cycles +- a terse language for algorithmic patterns +- dynamic music sequencing +- algorithmic composition +- live improvisation +- probably more exciting than your regular DAW + +
+ +![whirlpool](./strudel_icon.png) + +
+ +