Merge pull request #177 from mlabs-haskell/jared/typescript-testsuite

Typescript testsuite

Author: jaredponn

docs/typescript-plutus/api/lbf/build.nix

@@ -2,7 +2,7 @@ _:
 {
   perSystem = { config, ... }:
     let
-      tsFlake =
+      lbf-plutus-sample-project-typescript =
         config.lbf-nix.lbfPlutusTypescript {
           name = "lbf-plutus-sample-project";
           src = ./.;
@@ -11,7 +11,7 @@ _:
     in
     {
       packages = {
-        inherit (tsFlake.packages) lbf-plutus-sample-project-typescript lbf-plutus-sample-project-typescript-tgz;
+        inherit lbf-plutus-sample-project-typescript;
       };
     };
 }

docs/typescript-plutus/build.nix

@@ -10,7 +10,7 @@
           src = ./.;
 
           npmExtraDependencies = [
-            config.packages.lbf-plutus-sample-project-typescript-tgz
+            config.packages.lbf-plutus-sample-project-typescript
           ];
 
           devShellTools = config.settings.shell.tools;

docs/typescript-prelude/api/lbf/build.nix

@@ -2,7 +2,7 @@ _:
 {
   perSystem = { config, ... }:
     let
-      tsFlake =
+      lbf-prelude-sample-project-typescript =
         config.lbf-nix.lbfPreludeTypescript {
           name = "lbf-prelude-sample-project";
           src = ./.;
@@ -11,7 +11,7 @@ _:
     in
     {
       packages = {
-        inherit (tsFlake.packages) lbf-prelude-sample-project-typescript lbf-prelude-sample-project-typescript-tgz;
+        inherit lbf-prelude-sample-project-typescript;
       };
     };
 }

docs/typescript-prelude/build.nix

@@ -9,7 +9,7 @@
           name = "prelude-sample-project";
           src = ./.;
           npmExtraDependencies = [
-            config.packages.lbf-prelude-sample-project-typescript-tgz
+            config.packages.lbf-prelude-sample-project-typescript
           ];
 
           devShellTools = config.settings.shell.tools;

extras/lbf-nix/lbf-typescript.nix

@@ -276,4 +276,4 @@ let
       });
     });
 in
-lbTypescriptFlake
+lbTypescriptFlake.packages."${name}-typescript-tgz"

flake.nix

@@ -88,10 +88,12 @@
         ./testsuites/lbt-prelude/lbt-prelude-haskell/build.nix
         ./testsuites/lbt-prelude/lbt-prelude-purescript/build.nix
         ./testsuites/lbt-prelude/lbt-prelude-rust/build.nix
+        ./testsuites/lbt-prelude/lbt-prelude-typescript/build.nix
         ./testsuites/lbt-plutus/api/build.nix
         ./testsuites/lbt-plutus/golden/build.nix
         ./testsuites/lbt-plutus/lbt-plutus-haskell/build.nix
         ./testsuites/lbt-plutus/lbt-plutus-purescript/build.nix
+        ./testsuites/lbt-plutus/lbt-plutus-typescript/build.nix
         ./testsuites/lbt-plutus/lbt-plutus-plutarch/build.nix
         ./testsuites/lbt-plutus/lbt-plutus-rust/build.nix
         ./experimental/build.nix

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

@@ -450,8 +450,8 @@ printCtorE ((_, tyN), (ctorN, _)) prodVals = do
           [ lbrace
           , indent 2 $
               vsep
-                [ "name" <+> colon <+> pretty '\'' <> ctorNDoc <> pretty '\'' <> comma
-                , "fields" <+> colon <+> singleDoc
+                [ "fields" <+> colon <+> singleDoc <> comma
+                , "name" <+> colon <+> pretty '\'' <> ctorNDoc <> pretty '\''
                 ]
           , rbrace
           ]
@@ -461,8 +461,8 @@ printCtorE ((_, tyN), (ctorN, _)) prodVals = do
           [ lbrace
           , indent 2 $
               vsep
-                [ "name" <+> colon <+> pretty '\'' <> ctorNDoc <> pretty '\'' <> comma
-                , "fields" <+> colon <+> encloseSep lbracket rbracket comma prodDocs
+                [ "fields" <+> colon <+> encloseSep lbracket rbracket comma prodDocs <> comma
+                , "name" <+> colon <+> pretty '\'' <> ctorNDoc <> pretty '\''
                 ]
           , rbrace
           ]

libs/build.nix

@@ -28,7 +28,7 @@
         configs = [ "${config.packages.codegen-configs}/purescript-prelude-base.json" ];
       };
 
-      lbf-prelude-typescript = (config.lbf-nix.lbfTypescript {
+      lbf-prelude-typescript = config.lbf-nix.lbfTypescript {
         name = "lbf-prelude";
         src = ./lbf-prelude;
         files = [ "Prelude.lbf" ];
@@ -38,7 +38,7 @@
           [
             config.packages.lbr-prelude-typescript-tgz
           ];
-      }).packages.lbf-prelude-typescript-tgz;
+      };
 
       lbf-prelude-plutarch = config.lbf-nix.lbfPlutarch' {
         name = "lbf-prelude-plutarch";
@@ -108,7 +108,7 @@
         ];
       };
 
-      lbf-plutus-typescript = (config.lbf-nix.lbfTypescript {
+      lbf-plutus-typescript = config.lbf-nix.lbfTypescript {
         name = "lbf-plutus";
         src = ./lbf-plutus;
         files = [ "Plutus/V1.lbf" "Plutus/V2.lbf" ];
@@ -123,7 +123,7 @@
             config.packages.lbf-prelude-typescript
             config.packages.lbr-plutus-typescript-tgz
           ];
-      }).packages.lbf-plutus-typescript-tgz;
+      };
 
       lbf-plutus-rust = config.lbf-nix.lbfRust {
         name = "lbf-plutus";

runtimes/typescript/lbr-plutus/package-lock.json

@@ -54,3 +54,5 @@ export interface IsPlutusDataInstances {
     dictA: PlutusLedgerApiPlutusData.IsPlutusData<A>,
   ) => PlutusLedgerApiPlutusData.IsPlutusData<Prelude.List<A>>;
 }
+IsPlutusData[LbrPrelude.List] =
+  PlutusLedgerApiPreludeInstances.isPlutusDataList;