wip: new GHC JS backend

cabal.project

@@ -1 +1,2 @@
-packages: glam
+packages: glam ~/th-abstraction
+allow-newer: base, template-haskell, deepseq

flake.nix

@@ -1,7 +1,8 @@
 {
   inputs.nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs2.url = "github:ncfavier/nixpkgs/ghc98";
 
-  outputs = { self, nixpkgs }: let
+  outputs = { self, nixpkgs, nixpkgs2 }: let
     examples = [
       { name = "fibonacci"; description = "Fibonacci sequence"; }
       { name = "primes"; description = "Prime numbers"; }
@@ -26,6 +27,9 @@
       overlays = [ haskellOverlay ];
     };
     hpkgs = pkgs.haskell.packages.ghc94;
+    pkgs2 = import nixpkgs2 {
+      inherit system;
+    };
   in {
     packages.${system} = rec {
       default = glam;
@@ -34,7 +38,8 @@
 
       glam-min-js = pkgs.runCommand "glam.min.js" {
         nativeBuildInputs = with pkgs; [ closurecompiler ];
-        glam = "${glam-js}/bin/glam.jsexe";
+        glam = "${pkgs.pkgsCross.ghcjs.haskell.packages.ghc98.glam}/bin/glam.jsexe";
+        # glam = /home/n/git/glam/dist-newstyle/build/javascript-ghcjs/ghc-9.7.20230505/glam-0.0/x/glam/build/glam/glam.jsexe;
       } ''
         closure-compiler -O advanced -W quiet --jscomp_off undefinedVars \
           --externs "$glam/all.js.externs" --js "$glam/all.js" --js_output_file "$out"
@@ -62,7 +67,7 @@
     devShells.${system}.default = hpkgs.shellFor {
       packages = ps: with ps; [ glam self.packages.${system}.glam-js ];
       nativeBuildInputs = with pkgs; [
-        haskell.compiler.ghcjs
+        pkgs2.pkgsCross.ghcjs.buildPackages.haskell.compiler.ghc98
         cabal-install
         haskell-language-server
       ];

glam/MainJS.hs

@@ -1,15 +1,17 @@
 {-# LANGUAGE ViewPatterns #-}
-import GHCJS.Marshal
-import GHCJS.Foreign.Callback
+import Control.Monad
+import GHC.JS.Prim
+import GHC.JS.Foreign.Callback
 
 import Glam.Run
 
-foreign import javascript unsafe "glam = $1"
+foreign import javascript unsafe "(f => glam = f)"
     setGlam :: Callback a -> IO ()
 
 main = do
-    setGlam =<< syncCallback1' \v -> do
-        Just input <- fromJSVal v
-        toJSVal $ either id unlines
-                $ runGlam
-                $ runFile "" input
+    setGlam <=< syncCallback1' $
+        pure . toJSString
+             . either id unlines
+             . runGlam
+             . runFile ""
+             . fromJSString

glam/glam.cabal

@@ -51,11 +51,9 @@ executable glam
   ghc-options:         -W
   ghcjs-options:       -dedupe
 
-  if impl(ghcjs)
+  if os(ghcjs)
     main-is: MainJS.hs
     cpp-options: -DGHCJS_BROWSER
-    build-depends:
-      ghcjs-base
   else
     main-is: Main.hs
     build-depends: