refactor file structure and introduce nix involvement in js builds

.github/workflows/default.yml

@@ -16,11 +16,11 @@ jobs:
       with:
         name: csound-wasm
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-    - name: Compile csound to wasm
-      run: nix-env -i -f nix/compile.nix
     - name: Install npm dependencies via yarn
       run: yarn
     - name: Test
       run: yarn lint
+    - name: Compile csound natively to wasm
+      run: yarn compile
     - name: Build javascript bundle
       run: yarn build

nix/native/compile.nix

@@ -0,0 +1,13 @@
+{ pkgs ? import <nixpkgs> {}, dev ? false }:
+let
+  L = pkgs.callPackage ./libcsound_objects.nix {};
+  clangCustom = import ./clangCustom.nix { pkgsOrig = pkgs; };
+
+in pkgs.runCommand "csound-native-wasm" {} ''
+  mkdir $out
+  cp ${L.csoundP}/lib/libcsound.wasm $out
+  # cp ${L.csoundP}/lib/csound_exe.wasm $out
+  # make a compressed version for the browser bundle
+  ${pkgs.zopfli}/bin/zopfli --zlib -c \
+    ${L.csoundP}/lib/libcsound.wasm > $out/libcsound.wasm.zlib
+''

nix/libcsound_objects.nix → nix/native/libcsound_objects.nix

@@ -321,8 +321,8 @@ pkgs.callPackage
 
           buildPhase = ''
             mkdir -p build && cd build
-            cp ${../c/csound_wasm.c} ./csound_wasm.c
-            cp ${../c/unsupported_opcodes.c} ./unsupported_opcodes.c
+            cp ${../../c/csound_wasm.c} ./csound_wasm.c
+            cp ${../../c/unsupported_opcodes.c} ./unsupported_opcodes.c
 
             # ../OOps/lpred.c
 

nix/nodejs/build.nix

@@ -0,0 +1,17 @@
+with (import <nixpkgs> {});
+with builtins;
+pkgs.mkYarnPackage rec {
+  name = "csound-wasm";
+  # shellHook = pkgs.yarn2nix-moretea.linkNodeModulesHook;
+  src = ../..;
+  packageJSON = "${src}/package.json";
+  yarnLock = "${src}/yarn.lock";
+  yarnNix = "${src}/yarn.nix";
+  buildPhase = "npx rollup -c";
+  installPhase = ''
+    mkdir -p $out
+    cp deps/csound-wasm/dist/libcsound.mjs $out
+    cp deps/csound-wasm/dist/libcsound.mjs.map $out
+  '';
+  distPhase = "true";
+}

package.json

@@ -15,12 +15,11 @@
     "wasi"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "compile": "nix-shell nix/compile.nix",
-    "compile:debug": "nix-shell nix/compile.nix --arg debug true",
+    "compile": "nix build '(with import <nixpkgs> {}; import ./nix/native/compile.nix)' -o lib",
+    "compile:debug": "nix-shell nix/native/compile.nix --arg debug true",
     "compile:dev": "nix-shell nix/compile.nix --arg debug true --arg dev true",
     "lint": "eslint 'src/**/*.js'",
-    "build": "npx rollup -c"
+    "build": "nix build '(with import <nixpkgs> {}; import ./nix/nodejs/build.nix)' -o dist"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.1",