Merge pull request #135 from mlabs-haskell/bladyjoker/ctl-upgrade

Upgrading to CTL latest

Author: bladyjoker

extras/flake-purescript.nix

@@ -1,25 +1,39 @@
 pkgs: pursProjOpts:
 let
-  mkFlake = projectName: purs: {
-    packages = {
-      "purescript:${projectName}:src" = pkgs.stdenv.mkDerivation {
-        name = projectName;
-        inherit (pursProjOpts) src;
-        phases = "installPhase";
-        installPhase = "ln -s $src $out";
+  mkFlake = projectName: purs:
+    {
+      packages = {
+        "purescript:${projectName}:src" = pkgs.stdenv.mkDerivation {
+          name = projectName;
+          inherit (pursProjOpts) src;
+          phases = "installPhase";
+          installPhase = "ln -s $src $out";
+        };
+        "purescript:${projectName}:lib" = purs.compiled;
+        "purescript:${projectName}:node-modules" = purs.nodeModules;
+        "purescript:${projectName}:webpack-web" = purs.bundlePursProjectWebpack {
+          main = "Test.Main";
+          entrypoint = "app/index.js";
+          bundledModuleName = "dist/output.js";
+        };
+        "purescript:${projectName}:esbuild-web" = purs.bundlePursProjectEsbuild {
+          main = "Test.Main";
+          browserRuntime = true;
+        };
+        "purescript:${projectName}:esbuild-nodejs" = purs.bundlePursProjectEsbuild {
+          main = "Test.Main";
+          browserRuntime = false;
+        };
+
+        "purescript:${projectName}:docs" = purs.buildPursDocs { };
+        "purescript:${projectName}:docs-search" = purs.buildSearchablePursDocs { };
       };
-      "purescript:${projectName}:lib" = purs.compiled;
-      "purescript:${projectName}:node-modules" = purs.nodeModules;
-      "purescript:${projectName}:bundle" = purs.bundlePursProject { main = "Test.Main"; entrypoint = "app/index.js"; bundledModuleName = "dist/output.js"; };
-      "purescript:${projectName}:docs" = purs.buildPursDocs { };
-      "purescript:${projectName}:docs-search" = purs.buildSearchablePursDocs { };
-    };
 
-    checks = {
-      "purescript:${projectName}:check" = purs.runPursTest { };
-    };
+      checks = {
+        "purescript:${projectName}:check" = purs.runPursTest { testMain = "Test.Main"; };
+      };
 
-    devShell = purs.devShell;
-  };
+      devShell = purs.devShell;
+    };
 in
 mkFlake pursProjOpts.projectName (pkgs.purescriptProject pursProjOpts)

flake.lock

@@ -8,7 +8,7 @@
     protobufs-nix.url = "github:mlabs-haskell/protobufs.nix";
     mlabs-tooling.url = "github:mlabs-haskell/mlabs-tooling.nix";
     hci-effects.url = "github:hercules-ci/hercules-ci-effects";
-    ctl.url = "github:plutonomicon/cardano-transaction-lib/bladyjoker/lambda-buffers-catalyst"; # path:/home/bladyjoker/Desktop/cardano-transaction-lib;
+    ctl.url = "github:plutonomicon/cardano-transaction-lib?rev=fbf56b2965752ced05fd7f3a2d7ae6778e566df9";
     iohk-nix.url = "github:input-output-hk/iohk-nix";
     flake-parts.url = "github:hercules-ci/flake-parts";
     purifix.url = "github:purifix/purifix";

flake.nix

@@ -41,8 +41,8 @@
       "CodePoint"
     ],
     "Prelude.Integer": [
-      "bigints",
-      "Data.BigInt",
+      "js-bigints",
+      "JS.BigInt",
       "BigInt"
     ],
     "Prelude.Bool": [

lambda-buffers-codegen/data/purescript-prelude-base.json

@@ -35,7 +35,7 @@ caseInt :: Purs.QValName
 caseInt = normalValName "lbr-prelude" "LambdaBuffers.Runtime.Prelude" "caseInt"
 
 fromInt :: Purs.QValName
-fromInt = normalValName "bigint" "Data.BigInt" "fromInt"
+fromInt = normalValName "js-bigints" "JS.BigInt" "fromInt"
 
 printCtorCase :: MonadPrint m => PC.QTyName -> ((LV.Ctor, [LV.ValueE]) -> LV.ValueE) -> LV.Ctor -> m (Doc ann)
 printCtorCase (_, tyn) ctorCont ctor@(ctorN, fields) = do

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Purescript/Print/LamVal.hs

@@ -14,7 +14,7 @@ _:
           withRuntime = false;
           packageLockOnly = true;
           packages = [
-            pkgs.nodejs_16
+            pkgs.nodejs-18_x
             pkgs.bashInteractive
             pkgs.fd
           ] ++ config.settings.shell.tools;

runtimes/purescript/lbr-plutus/build.nix

@@ -0,0 +1,53 @@
+import * as esbuild from "esbuild";
+import { wasmLoader } from "esbuild-plugin-wasm";
+import { polyfillNode } from "esbuild-plugin-polyfill-node";
+
+if (process.argv.length < 4) {
+    throw `usage: node bundle.js ENTRY_POINT OUTPUT_FILENAME`;
+}
+
+const isBrowser = !!process.env.BROWSER_RUNTIME;
+
+export const buildOptions = ({ entryPoint, outfile }) => {
+    const config = {
+        entryPoints: [entryPoint],
+        outfile: outfile,
+        define: {
+            BROWSER_RUNTIME: isBrowser ? "true" : '""',
+        },
+        plugins: [
+            wasmLoader({
+                mode: "deferred",
+            }),
+        ],
+        bundle: true,
+        platform: isBrowser ? "browser" : "node",
+        format: "esm",
+        treeShaking: true,
+        logLevel: "error",
+    };
+
+    // https://esbuild.github.io/api/#packages
+    if (!isBrowser) {
+        config.packages = "external";
+    } else {
+        config.plugins.push(
+            polyfillNode({
+                polyfills: {
+                    crypto: true,
+                    fs: true,
+                    os: true,
+                },
+            })
+        );
+    }
+
+    return config;
+};
+
+esbuild.build(
+    buildOptions({
+        entryPoint: process.argv[2],
+        outfile: process.argv[3],
+    })
+);