@grame/faustwasm 0.0.45 → 0.0.46

package/package.json

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

package/scripts/faust2wasm.js

@@ -2,7 +2,7 @@
 //@ts-check
 import * as process from "process";
 import faust2wasmFiles from "../src/faust2wasmFiles.js";
-import copyWebStandaloneAssets from "../src/copyWebStandaloneAssets.js";
+import { copyWebStandaloneAssets, copyTemplate } from "../src/copyWebStandaloneAssets.js";
 
 const argv = process.argv.slice(2);
 
@@ -26,5 +26,9 @@ const [inputFile, outputDir, ...argvFaust] = argv;
 
 (async () => {
     await faust2wasmFiles(inputFile, outputDir, argvFaust, poly);
-    if (standalone) copyWebStandaloneAssets(outputDir);
+    if (standalone) {
+        copyWebStandaloneAssets(outputDir);
+    } else {
+        copyTemplate(outputDir, poly);
+    }
 })();

package/src/FaustDspGenerator.ts

@@ -103,7 +103,7 @@ export interface IFaustPolyDspGenerator {
      * 
      * @param compiler - the Faust compiler
      * @param name - the DSP name
-     * @param dspCode - the DSP code ('dsp_code' can possibly contain an integrated effect)
+     * @param dspCode - the DSP code ('dspCode' can possibly contain an integrated effect)
      * @param args - the compilation parameters
      * @param effectCode - optional effect DSP code
      * @returns the compiled factory or 'null' if failure
@@ -119,7 +119,7 @@ export interface IFaustPolyDspGenerator {
      * @param voices - the number of voices
      * @param name - AudioWorklet Processor name
      * @param voiceFactory - the Faust factory for voices, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
-     * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files)
+     * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files located in the 'faustwasm' package)
      * @param effectFactory - the Faust factory for the effect, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
      * @param sp - whether to compile a ScriptProcessorNode or an AudioWorkletNode
      * @param bufferSize - the buffer size in frames to be used in ScriptProcessorNode only, since AudioWorkletNode always uses 128 frames

package/src/copyWebStandaloneAssets.d.ts

@@ -1,3 +1,4 @@
 declare const copyWebStandaloneAssets: (outputDir: string) => void;
+declare const copyTemplate: (outputDir: string, poly: boolean) => void;
 
-export default copyWebStandaloneAssets;
+export { copyWebStandaloneAssets, copyTemplate };

package/src/copyWebStandaloneAssets.js

@@ -17,4 +17,19 @@ const copyWebStandaloneAssets = (outputDir) => {
     cpSync(assetsPath, outputDir);
 };
 
-export default copyWebStandaloneAssets;
+/**
+ * @param {string} outputDir
+ */
+const copyTemplate = (outputDir, poly = false) => {
+    console.log(`Writing index file.`)
+    if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir);
+    const templateJSPath = path.join(__dirname, "../assets/standalone/template.js");
+    const templateHTMLPath = (poly) ? path.join(__dirname, "../assets/standalone/template-poly.html") : path.join(__dirname, "../assets/standalone/template.html");
+    const faustwasmPath = path.join(__dirname, "../assets/standalone/faustwasm");
+    cpSync(templateJSPath, outputDir + "/template.js");
+    cpSync(templateHTMLPath, outputDir + "/template.html");
+    cpSync(faustwasmPath, outputDir + "/faustwasm");
+};
+
+export { copyWebStandaloneAssets, copyTemplate };
+

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -1199,7 +1199,7 @@ export interface IFaustPolyDspGenerator {
 	 *
 	 * @param compiler - the Faust compiler
 	 * @param name - the DSP name
-	 * @param dspCode - the DSP code ('dsp_code' can possibly contain an integrated effect)
+	 * @param dspCode - the DSP code ('dspCode' can possibly contain an integrated effect)
 	 * @param args - the compilation parameters
 	 * @param effectCode - optional effect DSP code
 	 * @returns the compiled factory or 'null' if failure
@@ -1215,7 +1215,7 @@ export interface IFaustPolyDspGenerator {
 	 * @param voices - the number of voices
 	 * @param name - AudioWorklet Processor name
 	 * @param voiceFactory - the Faust factory for voices, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
-	 * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files)
+	 * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files located in the 'faustwasm' package)
 	 * @param effectFactory - the Faust factory for the effect, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
 	 * @param sp - whether to compile a ScriptProcessorNode or an AudioWorkletNode
 	 * @param bufferSize - the buffer size in frames to be used in ScriptProcessorNode only, since AudioWorkletNode always uses 128 frames