From 484c5e6cddd7426138da77c32da96f63d8172cbc Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 01:26:25 -0400 Subject: [PATCH 1/7] working --- website/src/repl/idbutils.mjs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/website/src/repl/idbutils.mjs b/website/src/repl/idbutils.mjs index d87d649c2..9dfc9faae 100644 --- a/website/src/repl/idbutils.mjs +++ b/website/src/repl/idbutils.mjs @@ -92,11 +92,7 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete = async function blobToDataUrl(blob) { return new Promise((resolve) => { - var reader = new FileReader(); - reader.onload = function (event) { - resolve(event.target.result); - }; - reader.readAsDataURL(blob); + resolve(URL.createObjectURL(blob)) }); } From f38792c5699c7f00aedcdfddc80c726dc21810de Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 01:32:24 -0400 Subject: [PATCH 2/7] format --- packages/superdough/sampler.mjs | 1 + website/src/repl/idbutils.mjs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs index 3232fa476..7b7a6d3b6 100644 --- a/packages/superdough/sampler.mjs +++ b/packages/superdough/sampler.mjs @@ -349,6 +349,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) { } function registerSample(key, bank, params) { + console.info({ key, bank }); registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), { type: 'sample', samples: bank, diff --git a/website/src/repl/idbutils.mjs b/website/src/repl/idbutils.mjs index 9dfc9faae..e1ca3a604 100644 --- a/website/src/repl/idbutils.mjs +++ b/website/src/repl/idbutils.mjs @@ -92,7 +92,7 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete = async function blobToDataUrl(blob) { return new Promise((resolve) => { - resolve(URL.createObjectURL(blob)) + resolve(URL.createObjectURL(blob)); }); } From a41b07c67a19fd6361c75b2e251f04dcac9c8a91 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 01:44:32 -0400 Subject: [PATCH 3/7] fixed build --- packages/codemirror/autocomplete.mjs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/codemirror/autocomplete.mjs b/packages/codemirror/autocomplete.mjs index b8a569bea..fd8ff9e29 100644 --- a/packages/codemirror/autocomplete.mjs +++ b/packages/codemirror/autocomplete.mjs @@ -1,8 +1,9 @@ import jsdoc from '../../doc.json'; import { autocompletion } from '@codemirror/autocomplete'; import { h } from './html'; -import { Scale } from '@tonaljs/tonal'; -import { soundMap } from 'superdough'; +//TODO: fix tonal scale import +// import { Scale } from '@tonaljs/tonal'; +import { soundMap } from '@strudel/webaudio'; import { complex } from '@strudel/tonal'; const escapeHtml = (str) => { @@ -90,13 +91,13 @@ export function bankCompletions() { .map((name) => ({ label: name, type: 'bank' })); } -// Attempt to get all scale names from Tonal -let scaleCompletions = []; -try { - scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' })); -} catch (e) { - console.warn('[autocomplete] Could not load scale names from Tonal:', e); -} +// Attempt to get all scale names from Tonal TODO: FIX IMPORT +// let scaleCompletions = []; +// try { +// scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' })); +// } catch (e) { +// console.warn('[autocomplete] Could not load scale names from Tonal:', e); +// } // Valid mode values for voicing const modeCompletions = [ From 10bfe32a2d7e4f6e81a8b87c5c24d0cd2fb8a94a Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 01:48:42 -0400 Subject: [PATCH 4/7] rm console --- packages/superdough/sampler.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs index 9cf96d478..84bac3582 100644 --- a/packages/superdough/sampler.mjs +++ b/packages/superdough/sampler.mjs @@ -347,7 +347,6 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) { } function registerSample(key, bank, params) { - console.info({ key, bank }); registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), { type: 'sample', samples: bank, From 7b928749091f204d23810c2b48e187b87479a237 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 01:55:05 -0400 Subject: [PATCH 5/7] fix broken array --- packages/codemirror/autocomplete.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/codemirror/autocomplete.mjs b/packages/codemirror/autocomplete.mjs index fd8ff9e29..0e15a41f7 100644 --- a/packages/codemirror/autocomplete.mjs +++ b/packages/codemirror/autocomplete.mjs @@ -92,7 +92,7 @@ export function bankCompletions() { } // Attempt to get all scale names from Tonal TODO: FIX IMPORT -// let scaleCompletions = []; +let scaleCompletions = []; // try { // scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' })); // } catch (e) { From 2b575d50b9af222039aa9c42fa466413cbf8dd17 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 02:39:43 -0400 Subject: [PATCH 6/7] temporarily disable sample autocomplete --- packages/codemirror/autocomplete.mjs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/codemirror/autocomplete.mjs b/packages/codemirror/autocomplete.mjs index 0e15a41f7..9d01f8e9b 100644 --- a/packages/codemirror/autocomplete.mjs +++ b/packages/codemirror/autocomplete.mjs @@ -3,7 +3,8 @@ import { autocompletion } from '@codemirror/autocomplete'; import { h } from './html'; //TODO: fix tonal scale import // import { Scale } from '@tonaljs/tonal'; -import { soundMap } from '@strudel/webaudio'; +// import { soundMap } from '@strudel/webaudio'; +let soundMap = undefined; import { complex } from '@strudel/tonal'; const escapeHtml = (str) => { @@ -80,7 +81,9 @@ const hasExcludedTags = (doc) => ['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag)); export function bankCompletions() { - const soundDict = soundMap.get(); + // TODO: FIX IMPORT + const soundDict = soundMap?.get() ?? {}; + const banks = new Set(); for (const key of Object.keys(soundDict)) { const [bank, suffix] = key.split('_'); @@ -269,7 +272,7 @@ function soundHandler(context) { const inside = text.slice(quoteIdx + 1); const fragMatch = inside.match(SOUND_FRAGMENT_MATCH_REGEX); const fragment = fragMatch ? fragMatch[1] : inside; - const soundNames = Object.keys(soundMap.get()).sort(); + const soundNames = Object.keys(soundMap?.get() ?? {}).sort(); const filteredSounds = soundNames.filter((name) => name.includes(fragment)); let options = filteredSounds.map((name) => ({ label: name, type: 'sound' })); const from = soundContext.to - fragment.length; From 4f046ae88355fb384a1a01d35dd51e2c5fb85457 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 1 Nov 2025 02:40:40 -0400 Subject: [PATCH 7/7] cf --- packages/codemirror/autocomplete.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/codemirror/autocomplete.mjs b/packages/codemirror/autocomplete.mjs index 9d01f8e9b..20c128188 100644 --- a/packages/codemirror/autocomplete.mjs +++ b/packages/codemirror/autocomplete.mjs @@ -83,7 +83,7 @@ const hasExcludedTags = (doc) => export function bankCompletions() { // TODO: FIX IMPORT const soundDict = soundMap?.get() ?? {}; - + const banks = new Set(); for (const key of Object.keys(soundDict)) { const [bank, suffix] = key.split('_');