Refactored lbf-typescript to return the tgz file directly

Author: jared

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"

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";

testsuites/lbt-plutus/api/build.nix

@@ -26,12 +26,11 @@ _: {
           files = [ "Foo.lbf" "Foo/Bar.lbf" "Days.lbf" ];
         };
 
-        lbf-plutus-golden-api-typescript = (config.lbf-nix.lbfPlutusTypescript {
+        lbf-plutus-golden-api-typescript = config.lbf-nix.lbfPlutusTypescript {
           name = "lbf-plutus-golden-api";
           src = ./.;
           files = [ "Foo.lbf" "Foo/Bar.lbf" "Days.lbf" ];
-        }).packages.lbf-plutus-golden-api-typescript-tgz
-        ;
+        };
 
       };
     };

testsuites/lbt-prelude/api/build.nix

@@ -20,11 +20,11 @@ _: {
           files = [ "Foo.lbf" "Foo/Bar.lbf" "Days.lbf" ];
         };
 
-        lbf-prelude-golden-api-typescript = (config.lbf-nix.lbfPreludeTypescript {
+        lbf-prelude-golden-api-typescript = config.lbf-nix.lbfPreludeTypescript {
           name = "lbf-prelude-golden-api";
           src = ./.;
           files = [ "Foo.lbf" "Foo/Bar.lbf" "Days.lbf" ];
-        }).packages.lbf-prelude-golden-api-typescript-tgz;
+        };
       };
     };
 }