@grame/faustwasm 0.4.9 → 0.5.0

package/package.json

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

package/scripts/faust2wasm.js

@@ -2,13 +2,13 @@
 //@ts-check
 import * as process from "process";
 import faust2wasmFiles from "../src/faust2wasmFiles.js";
-import { copyWebStandaloneAssets, copyWebTemplateAssets } from "../src/copyWebStandaloneAssets.js";
+import { copyWebStandaloneAssets, copyWebPWAAssets, copyWebTemplateAssets } from "../src/copyWebStandaloneAssets.js";
 
 const argv = process.argv.slice(2);
 
 if (argv[0] === "-help" || argv[0] === "-h") {
     console.log(`
-faust2wasm.js <file.dsp> <outputDir> [-poly] [-standalone] [-no-template]
+faust2wasm.js <file.dsp> <outputDir> [-poly] [-standalone] [-pwa] [-no-template]
 Generates WebAssembly and metadata JSON files of a given Faust DSP.
 `);
     process.exit();
@@ -22,6 +22,10 @@ const $standalone = argv.indexOf("-standalone");
 const standalone = $standalone !== -1;
 if (standalone) argv.splice($standalone, 1);
 
+const $pwa = argv.indexOf("-pwa");
+const pwa = $pwa !== -1;
+if (pwa) argv.splice($pwa, 1);
+
 const $noTemplate = argv.indexOf("-no-template");
 const noTemplate = $noTemplate !== -1;
 if (noTemplate) argv.splice($noTemplate, 1);
@@ -35,6 +39,8 @@ const dspName = fileName.replace(/\.dsp$/, '');
     const { dspMeta, effectMeta } = await faust2wasmFiles(inputFile, outputDir, argvFaust, poly);
     if (standalone) {
         copyWebStandaloneAssets(outputDir, dspName, poly, !!effectMeta);
+    } else if (pwa) {
+        copyWebPWAAssets(outputDir, dspName, poly, !!effectMeta);
     } else if (!noTemplate) {
         copyWebTemplateAssets(outputDir, dspName, poly, !!effectMeta);
     }

package/src/copyWebStandaloneAssets.d.ts

@@ -1,4 +1,5 @@
 declare const copyWebStandaloneAssets: (outputDir: string, dspName: string, poly?: boolean, effect?: boolean) => void;
+declare const copyWebPWAAssets: (outputDir: string, dspName: string, poly?: boolean, effect?: boolean) => void;
 declare const copyWebTemplateAssets: (outputDir: string, dspName: string, poly?: boolean, effect?: boolean) => void;
 
-export { copyWebStandaloneAssets, copyWebTemplateAssets };
+export { copyWebStandaloneAssets, copyWebPWAAssets, copyWebTemplateAssets };

package/src/copyWebStandaloneAssets.js

@@ -15,7 +15,6 @@ const __filename = fileURLToPath(import.meta.url);
  */
 const copyWebStandaloneAssets = (outputDir, dspName, poly = false, effect = false) => {
     console.log(`Writing assets files.`)
-    const assetsPath = path.join(__dirname, "../assets/standalone");
     if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir);
 
     const findAndReplace = ["FAUST_DSP_NAME", dspName];
@@ -30,7 +29,6 @@ const copyWebStandaloneAssets = (outputDir, dspName, poly = false, effect = fals
     cpSyncModify(templateJSPath, outputDir + `/index.js`, ...findAndReplace);
 
     const templateHTMLPath = path.join(__dirname, "../assets/standalone/index.html");
-    //cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP_NAME", dspName);
     cpSyncModify(templateHTMLPath, outputDir + `/index.html`, ...findAndReplace);
 
     const templateWorkerPath = path.join(__dirname, "../assets/standalone/service-worker.js");
@@ -49,6 +47,45 @@ const copyWebStandaloneAssets = (outputDir, dspName, poly = false, effect = fals
     cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, ...findAndReplace);
 };
 
+/**
+ * @param {string} outputDir - The output directory.
+ * @param {string} dspName - The name of the DSP to be loaded.
+ * @param {boolean} [poly] - Whether the DSP is polyphonic.
+ * @param {boolean} [effect] - Whether the DSP has an effect module.
+ */
+const copyWebPWAAssets = (outputDir, dspName, poly = false, effect = false) => {
+    console.log(`Writing assets files.`)
+    if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir);
+
+    const findAndReplace = ["FAUST_DSP_NAME", dspName];
+    if (poly) findAndReplace.push("FAUST_DSP_VOICES = 0", "FAUST_DSP_VOICES = 16");
+    if (poly && effect) findAndReplace.push("FAUST_DSP_HAS_EFFECT = false", "FAUST_DSP_HAS_EFFECT = true");
+
+    // Copy some files
+    const createNodeJSPath = path.join(__dirname, "../assets/standalone/create-node.js");
+    cpSyncModify(createNodeJSPath, outputDir + `/create-node.js`, ...findAndReplace);
+
+    const templateJSPath = path.join(__dirname, "../assets/standalone/index-pwa.js");
+    cpSyncModify(templateJSPath, outputDir + `/index.js`, ...findAndReplace);
+
+    const templateHTMLPath = path.join(__dirname, "../assets/standalone/index-pwa.html");
+    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, ...findAndReplace);
+
+    const templateWorkerPath = path.join(__dirname, "../assets/standalone/service-worker.js");
+    cpSyncModify(templateWorkerPath, outputDir + `/service-worker.js`, ...findAndReplace);
+
+    const templateIconPath = path.join(__dirname, "../assets/standalone/icon.png");
+    cpSync(templateIconPath, outputDir + `/icon.png`);
+
+    const faustwasmPath = path.join(__dirname, "../assets/standalone/faustwasm");
+    cpSync(faustwasmPath, outputDir + "/faustwasm");
+
+    const faustuiPath = path.join(__dirname, "../assets/standalone/faust-ui");
+    cpSync(faustuiPath, outputDir + "/faust-ui");
+
+    const templateManifestPath = path.join(__dirname, "../assets/standalone/manifest.json");
+    cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, ...findAndReplace);
+};
 /**
  * @param {string} outputDir - The output directory.
  * @param {string} dspName - The name of the DSP to be loaded.
@@ -78,5 +115,5 @@ const copyWebTemplateAssets = (outputDir, dspName, poly = false, effect = false)
     cpSync(faustwasmPath, outputDir + "/faustwasm");
 };
 
-export { copyWebStandaloneAssets, copyWebTemplateAssets };
+export { copyWebStandaloneAssets, copyWebPWAAssets, copyWebTemplateAssets };