smplr 0.22.0 → 0.23.0

package/dist/index.js

@@ -41,6 +41,14 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
+var __privateWrapper = (obj, member, setter, getter) => ({
+  set _(value) {
+    __privateSet(obj, member, value, setter);
+  },
+  get _() {
+    return __privateGet(obj, member, getter);
+  }
+});
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -86,7 +94,7 @@ __export(index_exports, {
   Versilian: () => Versilian,
   audioBufferToWav: () => audioBufferToWav,
   audioBufferToWav16: () => audioBufferToWav16,
-  drumMachineToSmplrJson: () => drumMachineToSmplrJson,
+  drumMachineToPreset: () => drumMachineToPreset,
   getDrumMachineNames: () => getDrumMachineNames,
   getElectricPianoNames: () => getElectricPianoNames,
   getMalletNames: () => getMalletNames,
@@ -96,12 +104,12 @@ __export(index_exports, {
   getSoundfontNames: () => getSoundfontNames,
   getVersilianInstruments: () => getVersilianInstruments,
   loadVersilianInstrument: () => loadVersilianInstrument,
-  mellotronToSmplrJson: () => mellotronToSmplrJson,
-  pianoToSmplrJson: () => pianoToSmplrJson,
+  mellotronToPreset: () => mellotronToPreset,
+  pianoToPreset: () => pianoToPreset,
   renderOffline: () => renderOffline,
-  samplerToSmplrJson: () => samplerToSmplrJson,
-  sf2InstrumentToSmplrJson: () => sf2InstrumentToSmplrJson,
-  soundfontToSmplrJson: () => soundfontToSmplrJson,
+  samplerToPreset: () => samplerToPreset,
+  sf2InstrumentToPreset: () => sf2InstrumentToPreset,
+  soundfontToPreset: () => soundfontToPreset,
   trimSilence: () => trimSilence
 });
 module.exports = __toCommonJS(index_exports);
@@ -938,11 +946,12 @@ var EMPTY_JSON = {
 function isSmplrJson(x) {
   return typeof x === "object" && x !== null && "groups" in x && Array.isArray(x.groups);
 }
-var _loadProgress, _buffers, _reversedBuffers, _defaults, _defaultVelocity, _aliases, _matcher, _voices2, _channel, _onLoadProgress, _onStart, _onEnded, _ccState, _disposed, _SmplrImpl_instances, assertNotDisposed_fn, getBuffer_fn, playNote_fn, normalizeNoteEvent_fn;
+var _loadProgress, _loadToken, _buffers, _reversedBuffers, _defaults, _defaultVelocity, _aliases, _matcher, _voices2, _channel, _onLoadProgress, _onStart, _onEnded, _ccState, _disposed, _SmplrImpl_instances, assertNotDisposed_fn, getBuffer_fn, playNote_fn, normalizeNoteEvent_fn;
 var SmplrImpl = class {
   constructor(context, jsonOrOptions, maybeOptions) {
     __privateAdd(this, _SmplrImpl_instances);
     __privateAdd(this, _loadProgress, { loaded: 0, total: 0 });
+    __privateAdd(this, _loadToken, 0);
     __privateAdd(this, _buffers, /* @__PURE__ */ new Map());
     __privateAdd(this, _reversedBuffers, /* @__PURE__ */ new Map());
     __privateAdd(this, _defaults);
@@ -1005,17 +1014,18 @@ var SmplrImpl = class {
     this.ready = p;
   }
   /**
-   * Load (or replace) the instrument descriptor. Creates a new RegionMatcher
-   * and fetches all sample buffers. Pre-loaded buffers (e.g. base64-decoded)
-   * can be passed via the `buffers` parameter — those skip the fetch step.
+   * Load (or replace) the instrument descriptor. All state (matcher, defaults,
+   * aliases, reversed-buffer cache, sample buffers) swaps atomically when the
+   * load resolves. Concurrent calls are serialized: only the latest call's
+   * result is committed; earlier in-flight calls resolve but do not mutate
+   * state.
    *
-   * Returns a Promise that resolves when all samples are ready.
+   * Pre-loaded buffers (e.g. base64-decoded) can be passed via the `buffers`
+   * parameter — those skip the fetch step.
    */
   loadInstrument(json, buffers) {
     __privateMethod(this, _SmplrImpl_instances, assertNotDisposed_fn).call(this, "load an instrument");
-    __privateSet(this, _defaults, json.defaults);
-    __privateSet(this, _aliases, json.aliases ? new Map(Object.entries(json.aliases)) : void 0);
-    __privateSet(this, _matcher, new RegionMatcher(json));
+    const token = ++__privateWrapper(this, _loadToken)._;
     return this.loader.load(json, {
       buffers,
       onProgress: (loaded, total) => {
@@ -1024,6 +1034,11 @@ var SmplrImpl = class {
         (_a = __privateGet(this, _onLoadProgress)) == null ? void 0 : _a.call(this, { loaded, total });
       }
     }).then((newBuffers) => {
+      if (token !== __privateGet(this, _loadToken)) return;
+      __privateSet(this, _defaults, json.defaults);
+      __privateSet(this, _aliases, json.aliases ? new Map(Object.entries(json.aliases)) : void 0);
+      __privateSet(this, _matcher, new RegionMatcher(json));
+      __privateSet(this, _reversedBuffers, /* @__PURE__ */ new Map());
       __privateSet(this, _buffers, newBuffers);
     });
   }
@@ -1110,6 +1125,7 @@ var SmplrImpl = class {
   }
 };
 _loadProgress = new WeakMap();
+_loadToken = new WeakMap();
 _buffers = new WeakMap();
 _reversedBuffers = new WeakMap();
 _defaults = new WeakMap();
@@ -1371,12 +1387,12 @@ var DrumMachine = Instrument(
     const instrumentPromise = isDrumMachineInstrument(config.instrument) ? Promise.resolve(config.instrument) : fetchDrumMachineInstrument(config.url, config.storage);
     const ready = instrumentPromise.then((inst) => {
       instrument = inst;
-      return smplr.loadInstrument(drumMachineToSmplrJson(inst));
+      return smplr.loadInstrument(drumMachineToPreset(inst));
     });
     return { extras, ready };
   }
 );
-function drumMachineToSmplrJson(instrument) {
+function drumMachineToPreset(instrument) {
   const aliases = {};
   const regions = [];
   const BASE_MIDI = 36;
@@ -2248,7 +2264,7 @@ var Sequencer = class {
 };
 
 // src/smplr/sfz-convert.ts
-function sfzToSmplrJson(sfzText, options) {
+function sfzToPreset(sfzText, options) {
   var _a;
   const formats = (_a = options.formats) != null ? _a : ["ogg", "m4a"];
   const tokens = tokenize(resolveDefines(sfzText));
@@ -2558,7 +2574,7 @@ var ElectricPiano = Instrument(
       (sfzText) => {
         var _a;
         return smplr.loadInstrument(
-          sfzToSmplrJson(sfzText, {
+          sfzToPreset(sfzText, {
             baseUrl: config.baseUrl,
             pathFromSampleName: config.pathFromSampleName,
             formats: (_a = options.formats) != null ? _a : ["ogg", "m4a"]
@@ -2593,7 +2609,7 @@ function loadVersilianInstrument(smplr, options) {
   const sampleBaseUrl = `${VCSL_BASE_URL}/${base}`;
   return fetch(sfzUrl).then((r) => r.text()).then(
     (sfzText) => smplr.loadInstrument(
-      sfzToSmplrJson(sfzText, {
+      sfzToPreset(sfzText, {
         baseUrl: sampleBaseUrl,
         pathFromSampleName: (name) => name.replace(/\.wav$/i, ""),
         formats: ["ogg", "m4a"]
@@ -2698,7 +2714,7 @@ var Mellotron = Instrument(
     const baseUrl = `https://smpldsnds.github.io/archiveorg-mellotron/${instrumentName}/`;
     return fetch(baseUrl + "files.json").then((r) => r.json()).then(
       (names) => smplr.loadInstrument(
-        mellotronToSmplrJson(names, {
+        mellotronToPreset(names, {
           instrument: instrumentName,
           variation: variation == null ? void 0 : variation[1]
         })
@@ -2706,7 +2722,7 @@ var Mellotron = Instrument(
     );
   }
 );
-function mellotronToSmplrJson(sampleNames, config) {
+function mellotronToPreset(sampleNames, config) {
   var _a;
   const entries = [];
   for (const sampleName of sampleNames) {
@@ -2818,11 +2834,24 @@ _ready = new WeakMap();
 _output = new WeakMap();
 
 // src/sampler.ts
+function isSmplrPreset(x) {
+  return typeof x === "object" && x !== null && "groups" in x && Array.isArray(x.groups);
+}
 var Sampler = Instrument(
   (ctx, options = {}, smplr) => {
     var _a, _b;
     const storage = (_a = options.storage) != null ? _a : HttpStorage;
-    return getSource(ctx, (_b = options.buffers) != null ? _b : {}).then((source) => buildSamplerBuffers(source, ctx, storage, options)).then(({ json, buffers }) => smplr.loadInstrument(json, buffers));
+    const loadFromInput = (input) => {
+      if (isSmplrPreset(input)) {
+        return smplr.loadInstrument(input);
+      }
+      return getSource(ctx, input).then((source) => buildSamplerBuffers(source, ctx, storage, options)).then(({ json, buffers }) => smplr.loadInstrument(json, buffers));
+    };
+    const initialInput = "preset" in options && options.preset ? options.preset : (_b = options.buffers) != null ? _b : {};
+    return {
+      extras: { reload: loadFromInput },
+      ready: loadFromInput(initialInput)
+    };
   }
 );
 function getSource(ctx, raw) {
@@ -2836,7 +2865,7 @@ function getSource(ctx, raw) {
 }
 function buildSamplerBuffers(source, context, storage, options) {
   return __async(this, null, function* () {
-    const { json, urlMap, preloaded } = samplerToSmplrJson(source, options);
+    const { json, urlMap, preloaded } = samplerToPreset(source, options);
     yield Promise.all(
       Object.entries(urlMap).map((_0) => __async(null, [_0], function* ([name, url]) {
         const buffer = yield loadAudioBuffer(context, url, storage);
@@ -2846,7 +2875,7 @@ function buildSamplerBuffers(source, context, storage, options) {
     return { json, buffers: preloaded };
   });
 }
-function samplerToSmplrJson(source, options = {}) {
+function samplerToPreset(source, options = {}) {
   const keys = Object.keys(source);
   const preloaded = /* @__PURE__ */ new Map();
   const urlMap = {};
@@ -2945,7 +2974,7 @@ var Smolken = Instrument(
     const sfzUrl = getSmolkenUrl((_a = options.instrument) != null ? _a : "Arco");
     return fetch(sfzUrl).then((r) => r.text()).then(
       (sfzText) => smplr.loadInstrument(
-        sfzToSmplrJson(sfzText, {
+        sfzToPreset(sfzText, {
           baseUrl: SMOLKEN_BASE_URL,
           pathFromSampleName: (name) => name.replace(/\\/g, "/").replace(/\.wav$/i, ""),
           formats: ["ogg", "m4a"]
@@ -3136,10 +3165,7 @@ var Soundfont = Instrument(
     gain.gain.value = config.extraGain;
     smplr.output.addInsert(gain);
     return loadSoundfontData(ctx, config).then(
-      ({ buffers, noteNames, loopData }) => smplr.loadInstrument(
-        soundfontToSmplrJson(noteNames, loopData),
-        buffers
-      )
+      ({ buffers, noteNames, loopData }) => smplr.loadInstrument(soundfontToPreset(noteNames, loopData), buffers)
     );
   }
 );
@@ -3179,7 +3205,7 @@ function decodeSoundfontFile(context, config) {
     return { buffers, noteNames: [...buffers.keys()] };
   });
 }
-function soundfontToSmplrJson(noteNames, loopData) {
+function soundfontToPreset(noteNames, loopData) {
   const entries = [];
   for (const noteName of noteNames) {
     const midi = toMidi(noteName);
@@ -3272,7 +3298,7 @@ function base64ToArrayBuffer(base64) {
 }
 
 // src/soundfont2.ts
-function sf2InstrumentToSmplrJson(sf2Instrument, context) {
+function sf2InstrumentToPreset(sf2Instrument, context) {
   const buffers = /* @__PURE__ */ new Map();
   const regions = [];
   for (const zone of sf2Instrument.zones) {
@@ -3320,7 +3346,7 @@ var Soundfont2Sampler = Instrument(
           (inst) => inst.header.name === instrumentName
         );
         if (!sf2inst) return void 0;
-        const { json, buffers } = sf2InstrumentToSmplrJson(sf2inst, ctx);
+        const { json, buffers } = sf2InstrumentToPreset(sf2inst, ctx);
         return baseLoadInstrument(json, buffers);
       }
     };
@@ -3352,9 +3378,9 @@ var DEFAULTS = {
   decayTime: 0.5
 };
 var SplendidGrandPiano = Instrument(
-  (ctx, options = {}, smplr) => smplr.loadInstrument(pianoToSmplrJson(__spreadValues(__spreadValues({}, DEFAULTS), options)))
+  (ctx, options = {}, smplr) => smplr.loadInstrument(pianoToPreset(__spreadValues(__spreadValues({}, DEFAULTS), options)))
 );
-function pianoToSmplrJson(options) {
+function pianoToPreset(options) {
   var _a;
   const { notesToLoad } = options;
   const layers = notesToLoad ? LAYERS.filter(
@@ -3751,7 +3777,7 @@ var LAYERS = [
   Versilian,
   audioBufferToWav,
   audioBufferToWav16,
-  drumMachineToSmplrJson,
+  drumMachineToPreset,
   getDrumMachineNames,
   getElectricPianoNames,
   getMalletNames,
@@ -3761,12 +3787,12 @@ var LAYERS = [
   getSoundfontNames,
   getVersilianInstruments,
   loadVersilianInstrument,
-  mellotronToSmplrJson,
-  pianoToSmplrJson,
+  mellotronToPreset,
+  pianoToPreset,
   renderOffline,
-  samplerToSmplrJson,
-  sf2InstrumentToSmplrJson,
-  soundfontToSmplrJson,
+  samplerToPreset,
+  sf2InstrumentToPreset,
+  soundfontToPreset,
   trimSilence
 });
 //# sourceMappingURL=index.js.map