Merge branch 'main' into jade/orbitsynonym

Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1758

packages/core/controls.mjs

@@ -1833,6 +1833,7 @@ export const { octave } = registerControl('octave');
  * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
  *
  * @name orbit
+ * @synonyms o
  * @param {number | Pattern} number
  * @example
  * stack(
@@ -1840,7 +1841,7 @@ export const { octave } = registerControl('octave');
  *   s("~ sd ~ sd").delay(.5).delaytime(.125).orbit(2)
  * )
  */
-export const { orbit } = registerControl('orbit');
+export const { orbit } = registerControl('orbit', 'o');
 // TODO: what is this? not found in tidal doc Answer: gain is limited to maximum of 2. This allows you to go over that
 export const { overgain } = registerControl('overgain');
 // TODO: what is this? not found in tidal doc. Similar to above, but limited to 1

packages/core/repl.mjs

@@ -215,18 +215,20 @@ export function repl({
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
         let patterns = [];
+        let soloActive = false;
         for (const [key, value] of Object.entries(pPatterns)) {
-          patterns.push(value.withState((state) => state.setControls({ id: key })));
+          // handle soloed patterns ex: S$: s("bd!4")
+          const isSolod = key.length > 1 && key.startsWith('S');
+          if (isSolod && soloActive === false) {
+            // first time we see a soloed pattern, clear existing patterns
+            patterns = [];
+            soloActive = true;
+          }
+          if (!soloActive || (soloActive && isSolod)) {
+            const valWithState = value.withState((state) => state.setControls({ id: key }));
+            patterns.push(valWithState);
+          }
         }
-
-        // if there are solo patterns, only use those
-        const soloPatterns = Object.entries(pPatterns).filter(([key]) => key.length > 1 && key.startsWith('S'));
-        if (soloPatterns.length) {
-          patterns = Object.values(Object.fromEntries(soloPatterns));
-        }
-
-     
-    
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
           patterns = patterns.map((x) => eachTransform(x));
@@ -236,8 +238,8 @@ export function repl({
         pattern = eachTransform(pattern);
       }
       if (allTransforms.length) {
-        for (let i in allTransforms) {
-          pattern = allTransforms[i](pattern);
+        for (const transform of allTransforms) {
+          pattern = transform(pattern);
         }
       }
 

packages/superdough/helpers.mjs

@@ -238,7 +238,7 @@ export function createFilter(context, start, end, params, cps) {
   if (sync != null) {
     rate = cps * sync;
   }
-  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate };
+  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate, min: 10, max: 20000 };
   getParamLfo(context, frequencyParam, start, end, lfoValues);
   return filter;
 }
@@ -362,9 +362,9 @@ const mod = (freq, range = 1, type = 'sine') => {
   }
 
   osc.start();
-  const g = new GainNode(ctx, { gain: range });
+  const g = gainNode(range);
   osc.connect(g); // -range, range
-  return { node: g, stop: (t) => osc.stop(t) };
+  return { node: g, stop: (t) => osc.stop(t), osc: osc };
 };
 const fm = (frequencyparam, harmonicityRatio, modulationIndex, wave = 'sine') => {
   const carrfreq = frequencyparam.value;
@@ -416,6 +416,11 @@ export function applyFM(param, value, begin) {
       modulator.connect(envGain);
       envGain.connect(param);
     }
+    fmmod.osc.onended = () => {
+      envGain.disconnect();
+      modulator.disconnect();
+      fmmod.osc.disconnect();
+    };
   }
   return { stop };
 }

packages/superdough/worklets.mjs

@@ -543,8 +543,9 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         if (pn >= 1.0) pn -= 1.0;
         this.phase[n] = pn;
         // invert right and left gain
+        const tmp = gainL;
         gainL = gainR;
-        gainR = gainL;
+        gainR = tmp;
       }
     }
     return true;

website/src/components/Udels/UdelsHeader.jsx

@@ -4,13 +4,13 @@ export default function UdelsHeader(Props) {
   const { numWindows, setNumWindows } = Props;
 
   return (
-    <header id="header" className="flex text-white  z-[100] text-lg select-none bg-black">
+    <header id="header" className="flex text-white  z-[100] text-lg select-none bg-neutral-800">
       <div className="px-4 items-center gap-2  flex space-x-2 md:pt-0 select-none">
         <h1 onClick={() => {}} className={'text-l cursor-pointer flex gap-4'}>
-          <div className={'mt-[1px] cursor-pointer'}>🦄</div>
+          <div className={'mt-[1px] cursor-pointer'}>🌀</div>
 
-          <div>
-            <span className="font-mono text-">SWITCH ANGEL</span>
+          <div className={'animate-pulse'}>
+            <span className="">strudel</span> <span className="text-sm">-UDELS</span>
           </div>
         </h1>
         <NumberInput value={numWindows} setValue={setNumWindows} />

website/src/repl/components/Header.jsx

@@ -47,12 +47,12 @@ export function Header({ context, embedded = false }) {
               }
             }}
           >
-            <span className="block text-foreground ">*</span>
+            <span className="block text-foreground rotate-90">꩜</span>
           </div>
           {!isZen && (
             <div className="space-x-2">
-              <span className="">Switch Angel</span>
-              <span className="text-sm font-medium"></span>
+              <span className="">strudel</span>
+              <span className="text-sm font-medium">REPL</span>
               {!isEmbedded && isButtonRowHidden && (
                 <a href={`${baseNoTrailing}/learn`} className="text-sm opacity-25 font-medium">
                   DOCS
@@ -82,7 +82,47 @@ export function Header({ context, embedded = false }) {
               <>loading...</>
             )}
           </button>
-      
+          <button
+            onClick={handleEvaluate}
+            title="update"
+            className={cx(
+              'flex items-center space-x-1',
+              !isEmbedded ? 'p-2' : 'px-2',
+              !isDirty || !activeCode ? 'opacity-50' : 'hover:opacity-50',
+            )}
+          >
+            {!isEmbedded && <span>update</span>}
+          </button>
+          {/* !isEmbedded && (
+            <button
+              title="shuffle"
+              className="hover:opacity-50 p-2 flex items-center space-x-1"
+              onClick={handleShuffle}
+            >
+              <span> shuffle</span>
+            </button>
+          ) */}
+          {!isEmbedded && (
+            <button
+              title="share"
+              className={cx(
+                'cursor-pointer hover:opacity-50 flex items-center space-x-1',
+                !isEmbedded ? 'p-2' : 'px-2',
+              )}
+              onClick={handleShare}
+            >
+              <span>share</span>
+            </button>
+          )}
+          {!isEmbedded && (
+            <a
+              title="learn"
+              href={`${baseNoTrailing}/workshop/getting-started/`}
+              className={cx('hover:opacity-50 flex items-center space-x-1', !isEmbedded ? 'p-2' : 'px-2')}
+            >
+              <span>learn</span>
+            </a>
+          )}
           {/* {isEmbedded && (
             <button className={cx('hover:opacity-50 px-2')}>
               <a href={window.location.href} target="_blank" rel="noopener noreferrer" title="Open in REPL">

website/src/repl/components/panel/PatternsTab.jsx

@@ -79,7 +79,6 @@ const updateCodeWindow = (context, patternData, reset = false) => {
   context.handleUpdate(patternData, reset);
 };
 
-
 function UserPatterns({ context }) {
   const activePattern = useActivePattern();
   const viewingPatternStore = useViewingPatternData();

website/src/repl/useReplContext.jsx

@@ -36,7 +36,6 @@ import { getRandomTune, initCode, loadModules, shareCode } from './util.mjs';
 import './Repl.css';
 import { setInterval, clearInterval } from 'worker-timers';
 import { getMetadata } from '../metadata_parser';
-import jadeScriptsRaw from '../../../../../../switchangel/strudel-scripts/allscripts.js?raw'
 
 const { latestCode, maxPolyphony, audioDeviceName, multiChannelOrbits } = settingsMap.get();
 let modulesLoading, presets, drawContext, clearCanvas, audioReady;
@@ -143,10 +142,6 @@ export function useReplContext() {
         msg = `Default code has been loaded`;
       }
       editor.setCode(code);
-      // console.info(jadeScriptsRaw)
-      editor.repl.evaluate(jadeScriptsRaw)
-
-    
       setDocumentTitle(code);
       logger(`Welcome to Strudel! ${msg} Press play or hit ctrl+enter to run it!`, 'highlight');
     });