@grame/faustwasm 0.11.0 → 0.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",

package/src/FaustAudioWorkletNode.ts

@@ -132,7 +132,7 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
         if (this.fOutputHandler) {
             this.fOutputHandler(path, value);
         } else {
-            console.warn("No OutputParamHandler set for this FaustAudioWorkletNode.");
+            console.warn("No OutputParamHandler set for this Faust node.");
         }
     }
 

package/src/FaustCompiler.ts

@@ -2,7 +2,7 @@ import { Sha256 } from "@aws-crypto/sha256-js";
 import type { ILibFaust } from "./LibFaust";
 import type { FaustDspFactory, IntVector } from "./types";
 
-export const ab2str = (buf: Uint8Array) => String.fromCharCode.apply(null, buf);
+export const ab2str = (buf: Uint8Array) => String.fromCharCode.apply(null, Array.from(buf));
 
 export const str2ab = (str: string) => {
     const buf = new ArrayBuffer(str.length);
@@ -231,7 +231,7 @@ class FaustCompiler implements IFaustCompiler {
         const mixerBuffer = this.fs().readFile(path, { encoding: "binary" });
         this[bufferKey] = mixerBuffer;
         // Compile mixer
-        const mixerModule = await WebAssembly.compile(mixerBuffer);
+        const mixerModule = await WebAssembly.compile(new Uint8Array(mixerBuffer));
         this[moduleKey] = mixerModule;
         return { mixerBuffer, mixerModule };
     }
@@ -243,7 +243,7 @@ class FaustCompiler implements IFaustCompiler {
         const mixerBuffer = this.fs().readFile(path, { encoding: "binary" });
         this[bufferKey] = mixerBuffer;
         // Compile mixer
-        const mixerModule = new WebAssembly.Module(mixerBuffer);
+        const mixerModule = new WebAssembly.Module(new Uint8Array(mixerBuffer));
         this[moduleKey] = mixerModule;
         return { mixerBuffer, mixerModule };
     }

package/src/FaustWasmInstantiator.ts

@@ -123,9 +123,9 @@ class FaustWasmInstantiator {
 
     static async loadDSPMixer(mixerPath: string, fs?: typeof FS) {
         try {
-            let mixerBuffer = null;
+            let mixerBuffer: BufferSource | null = null;
             if (fs) {
-                mixerBuffer = fs.readFile(mixerPath, { encoding: "binary" });
+                mixerBuffer = new Uint8Array(fs.readFile(mixerPath, { encoding: "binary" }));
             } else {
                 const mixerFile = await fetch(mixerPath);
                 mixerBuffer = await mixerFile.arrayBuffer();

package/src/FaustWebAudioDsp.ts

@@ -985,7 +985,7 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         if (this.fOutputHandler) {
             this.fOutputHandler(path, value);
         } else {
-            console.warn("No OutputParamHandler set for this FaustAudioWorkletNode.");
+            console.warn("No OutputParamHandler set for this Faust node.");
         }
     }
 

package/src/instantiateFaustModule.ts

@@ -12,19 +12,23 @@ export const FaustModuleFactoryData = dataBinary;
 const instantiateFaustModule = async (FaustModuleFactoryIn = factoryFn, dataBinaryIn = dataBinary, wasmBinaryIn = wasmBinary) => {
     const g = globalThis as any;
     if (g.AudioWorkletGlobalScope) {
-        g.importScripts = () => {};
+        g.importScripts = () => { };
         g.self = { location: { href: "" } };
     }
     const faustModule = await FaustModuleFactoryIn({
-        wasmBinary: wasmBinaryIn,
+        // Create a copy to guarantee a standard ArrayBuffer
+        wasmBinary: (new Uint8Array(wasmBinaryIn)).buffer,
         getPreloadedPackage: (remotePackageName: string, remotePackageSize: number) => {
-            if (remotePackageName === "libfaust-wasm.data") return dataBinaryIn.buffer;
+            if (remotePackageName === "libfaust-wasm.data") {
+                // Create a copy to guarantee a standard ArrayBuffer
+                return (new Uint8Array(dataBinaryIn)).buffer;
+            }
             return new ArrayBuffer(0);
         }
     });
     if (g.AudioWorkletGlobalScope) {
-		delete g.importScripts;
-		delete g.self;
+        delete g.importScripts;
+        delete g.self;
     }
     return faustModule;
 };

package/src/instantiateFaustModuleFromFile.ts

@@ -9,7 +9,7 @@ import type { FaustModuleFactory } from "./types";
 const instantiateFaustModuleFromFile = async (jsFile: string, dataFile = jsFile.replace(/c?js$/, "data"), wasmFile = jsFile.replace(/c?js$/, "wasm")) => {
     let FaustModule: FaustModuleFactory;
     let dataBinary: ArrayBuffer;
-    let wasmBinary: Uint8Array | ArrayBuffer;
+    let wasmBinary: ArrayBuffer;
     const jsCodeHead = /var (.+) = \(/;
     if (typeof window === "object") {
         let jsCode = await (await fetch(jsFile)).text();
@@ -19,7 +19,7 @@ export default ${jsCode.match(jsCodeHead)?.[1]};
         const jsFileMod = URL.createObjectURL(new Blob([jsCode], { type: "text/javascript" }));
         FaustModule = (await import(/* webpackIgnore: true */jsFileMod)).default;
         dataBinary = await (await fetch(dataFile)).arrayBuffer();
-        wasmBinary = new Uint8Array(await (await fetch(wasmFile)).arrayBuffer());
+        wasmBinary = await (await fetch(wasmFile)).arrayBuffer();
     } else {
         const { promises: fs } = await import("fs");
         const { pathToFileURL } = await import("url");
@@ -42,15 +42,17 @@ export default ${jsCode.match(jsCodeHead)?.[1]};
         await fs.writeFile(jsFileMod, jsCode);
         FaustModule = (await import(/* webpackIgnore: true */pathToFileURL(jsFileMod).href)).default;
         await fs.unlink(jsFileMod);
-        dataBinary = (await fs.readFile(dataFile)).buffer;
-        wasmBinary = (await fs.readFile(wasmFile)).buffer;
+        // Using a type assertion `as ArrayBuffer` to satisfy the strict type checking.
+        dataBinary = (new Uint8Array(await fs.readFile(dataFile))).buffer as ArrayBuffer;
+        wasmBinary = (new Uint8Array(await fs.readFile(wasmFile))).buffer as ArrayBuffer;
     }
     const faustModule = await FaustModule({
         wasmBinary,
         getPreloadedPackage: (remotePackageName: string, remotePackageSize: number) => {
             if (remotePackageName === "libfaust-wasm.data") return dataBinary;
             return new ArrayBuffer(0);
-        }});
+        }
+    });
     return faustModule;
 };
 

package/test/faustlive-wasm/faust-ui/index.js

@@ -469,6 +469,14 @@ const _AbstractItem = class _AbstractItem extends _AbstractComponent__WEBPACK_IM
     };
     this.handleClick = (e) => {
     };
+    /**
+     * Handle double-click events to reset the value to its initial state.
+     */
+    this.handleDoubleClick = (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      this.setToInitialValue();
+    };
     this.handleMouseDown = (e) => {
       e.preventDefault();
       e.currentTarget.focus();
@@ -558,6 +566,9 @@ const _AbstractItem = class _AbstractItem extends _AbstractComponent__WEBPACK_IM
     if (changed) this.change(value);
     return changed;
   }
+  setToInitialValue() {
+    this.setValue(this.state.init);
+  }
   /**
    * Send value to DSP
    */
@@ -698,6 +709,7 @@ _AbstractItem.defaultProps = {
   address: "",
   min: 0,
   max: 1,
+  init: 0,
   enums: {},
   type: "float",
   unit: "",
@@ -886,6 +898,14 @@ __webpack_require__.r(__webpack_exports__);
 class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
   constructor() {
     super(...arguments);
+    /**
+     * Handle double-click events to reset all children's value to its initial state.
+     */
+    this.handleDoubleClick = (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      this.setToInitialValue();
+    };
     this.updateUI = () => {
       this.children = [];
       const { style, type, items, emitter, isRoot } = this.state;
@@ -946,10 +966,10 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
     if (!metaIn) return { metaObject };
     metaIn.forEach((m) => Object.assign(metaObject, m));
     if (metaObject.style) {
-      const enumsRegex = /\{(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+);)+(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+))\}/;
+      const enumsRegex = /\{\s*(?:['_\-](.+?)['_\-]\s*:\s*([-+]?[0-9]*\.?[0-9]+)\s*;\s*)+(?:['_\-](.+?)['_\-]\s*:\s*([-+]?[0-9]*\.?[0-9]+))\s*\}/;
       const matched = metaObject.style.match(enumsRegex);
       if (matched) {
-        const itemsRegex = /(?:(?:'|_|-)(.+?)(?:'|_|-):([-+]?[0-9]*\.?[0-9]+))/g;
+        const itemsRegex = /['_\-](.+?)['_\-]\s*:\s*([-+]?[0-9]*\.?[0-9]+)\s*/g;
         const enums = {};
         let item;
         while (item = itemsRegex.exec(matched[0])) {
@@ -1003,7 +1023,8 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
       min: isFinite(min) ? min : 0,
       max: isFinite(max) ? max : 1,
       step: "step" in item ? +item.step : 1,
-      value: "init" in item ? +item.init || 0 : 0
+      value: "init" in item ? +item.init || 0 : 0,
+      init: "init" in item ? +item.init || 0 : 0
     };
     if (type === "button") return new _Button__WEBPACK_IMPORTED_MODULE_5__["default"](props);
     if (type === "checkbox") return new _Checkbox__WEBPACK_IMPORTED_MODULE_6__["default"](props);
@@ -1020,6 +1041,9 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
     if (type === "led") return new _Led__WEBPACK_IMPORTED_MODULE_10__["default"](props);
     return null;
   }
+  setToInitialValue() {
+    this.children.forEach((item) => item.setToInitialValue());
+  }
   setState(newState) {
     let shouldUpdate = false;
     for (const key in newState) {
@@ -1091,7 +1115,7 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
     return this;
   }
   componentDidMount() {
-    var _a;
+    var _a, _b;
     const handleResize = () => {
       const { grid, left, top, width, height } = this.state.style;
       if (!this.state.isRoot) this.label.style.height = `${grid * 0.3}px`;
@@ -1125,7 +1149,8 @@ class Group extends _AbstractComponent__WEBPACK_IMPORTED_MODULE_0__["default"] {
     };
     this.on("label", () => this.schedule(labelChange));
     this.paintLabel();
-    if ((_a = this.tabs) == null ? void 0 : _a.children.length) this.tabs.children[0].click();
+    (_a = this.labelCanvas) == null ? void 0 : _a.addEventListener("dblclick", this.handleDoubleClick);
+    if ((_b = this.tabs) == null ? void 0 : _b.children.length) this.tabs.children[0].click();
     this.children.forEach((item) => item.componentDidMount());
     return this;
   }
@@ -1446,6 +1471,7 @@ class Knob extends _AbstractItem__WEBPACK_IMPORTED_MODULE_0__["default"] {
     super.componentDidMount();
     this.input.addEventListener("change", this.handleChange);
     this.canvas.addEventListener("pointerdown", this.handlePointerDown);
+    this.canvas.addEventListener("dblclick", this.handleDoubleClick);
     this.on("style", () => {
       this.schedule(this.setStyle);
       this.schedule(this.paint);
@@ -2471,6 +2497,7 @@ class VSlider extends _AbstractItem__WEBPACK_IMPORTED_MODULE_0__["default"] {
     super.componentDidMount();
     this.input.addEventListener("change", this.handleChange);
     this.canvas.addEventListener("pointerdown", this.handlePointerDown);
+    this.canvas.addEventListener("dblclick", this.handleDoubleClick);
     this.on("style", () => {
       this.schedule(this.setStyle);
       this.schedule(this.paint);