Clean up

cli/internal/fs/hash.go

@@ -5,7 +5,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/vercel/turbo/cli/internal/env"
 	"io"
 	"strconv"
 
@@ -39,17 +38,6 @@ func HashTask(task *hash.TaskHashable) (string, error) {
 
 // HashGlobal produces the global hash value to be incorporated in every task hash
 func HashGlobal(global hash.GlobalHashable) (string, error) {
-	global.GlobalFileHashMap = map[turbopath.AnchoredUnixPath]string{}
-	if global.ResolvedEnvVars == nil {
-		global.ResolvedEnvVars = env.EnvironmentVariablePairs{}
-	}
-	if global.PassThroughEnv == nil {
-		global.PassThroughEnv = []string{}
-	}
-	if global.DotEnv == nil {
-		global.DotEnv = []turbopath.AnchoredUnixPath{}
-	}
-
 	b, _ := json.MarshalIndent(global, "", "  ")
 	fmt.Println(string(b))
 	return hash.HashGlobalHashable(&global)

cli/internal/fs/hash/capnp.go

@@ -10,9 +10,7 @@ package hash
 
 import (
 	"encoding/hex"
-	"fmt"
 	"sort"
-	"strings"
 
 	capnp "capnproto.org/go/capnp/v3"
 	"github.com/vercel/turbo/cli/internal/env"
@@ -387,11 +385,10 @@ func HashMessage(msg *capnp.Message) (string, error) {
 		return "", err
 	}
 
-	bytesStr := make([]string, len(bytes))
-	for i, b := range bytes {
-		bytesStr[i] = fmt.Sprintf("%d", b)
+	err = turbopath.AbsoluteSystemPath("go-global-hash.capnp").WriteFile(bytes, 0644)
+	if err != nil {
+		return "", err
 	}
-	fmt.Printf("go buffer: %v\n", strings.Join(bytesStr, ", "))
 
 	digest := xxhash.New()
 	_, err = digest.Write(bytes)

crates/turborepo-lib/Cargo.toml

@@ -124,5 +124,5 @@ uds_windows = "1.0.2"
 async-io = "1.12.0"
 
 [build-dependencies]
-capnpc = "0.17.2"
+capnpc = "0.18.0"
 tonic-build = "0.8.4"

crates/turborepo-lib/src/hash/mod.rs

@@ -6,10 +6,9 @@
 
 mod traits;
 
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 
 use capnp::message::{Builder, HeapAllocator};
-use serde::Serialize;
 pub use traits::TurboHash;
 use turborepo_env::ResolvedEnvMode;
 
@@ -42,7 +41,6 @@ mod proto_capnp {
     }
 }
 
-#[derive(Debug)]
 pub struct TaskHashable<'a> {
     // hashes
     pub(crate) global_hash: &'a str,
@@ -64,10 +62,10 @@ pub struct TaskHashable<'a> {
     pub(crate) dot_env: &'a [turbopath::RelativeUnixPathBuf],
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Clone)]
 pub struct GlobalHashable<'a> {
     pub global_cache_key: &'static str,
-    pub global_file_hash_map: BTreeMap<turbopath::RelativeUnixPathBuf, String>,
+    pub global_file_hash_map: HashMap<turbopath::RelativeUnixPathBuf, String>,
     pub root_external_dependencies_hash: String,
     pub env: &'a [String],
     pub resolved_env_vars: Vec<String>,
@@ -80,7 +78,7 @@ pub struct GlobalHashable<'a> {
 pub struct LockFilePackages(pub Vec<turborepo_lockfiles::Package>);
 
 #[derive(Debug, Clone)]
-pub struct FileHashes(pub BTreeMap<turbopath::RelativeUnixPathBuf, String>);
+pub struct FileHashes(pub HashMap<turbopath::RelativeUnixPathBuf, String>);
 
 impl From<TaskOutputs> for Builder<HeapAllocator> {
     fn from(value: TaskOutputs) -> Self {
@@ -336,12 +334,11 @@ impl<'a> From<GlobalHashable<'a>> for Builder<HeapAllocator> {
             }
         }
 
-        let env_mode = match hashable.env_mode {
+        builder.set_env_mode(match hashable.env_mode {
             EnvMode::Infer => proto_capnp::global_hashable::EnvMode::Infer,
             EnvMode::Loose => proto_capnp::global_hashable::EnvMode::Loose,
             EnvMode::Strict => proto_capnp::global_hashable::EnvMode::Strict,
-        };
-        builder.set_env_mode(env_mode);
+        });
 
         builder.set_framework_inference(hashable.framework_inference);
 
@@ -363,7 +360,6 @@ impl<'a> From<GlobalHashable<'a>> for Builder<HeapAllocator> {
             + 1; // + 1 to solve an off by one error inside capnp
         let mut canon_builder =
             Builder::new(HeapAllocator::default().first_segment_words(size as u32));
-
         canon_builder
             .set_root_canonical(builder.reborrow_as_reader())
             .expect("can't fail");
@@ -404,7 +400,7 @@ mod test {
             dot_env: &[turbopath::RelativeUnixPathBuf::new("dotenv".to_string()).unwrap()],
         };
 
-        assert_eq!(task_hashable.hash(), "87819c32d170ce59");
+        assert_eq!(task_hashable.hash(), "ff765ee2f83bc034");
     }
 
     #[test]

crates/turborepo-lib/src/hash/proto.capnp

@@ -22,9 +22,8 @@ struct TaskHashable {
     dotEnv @12 :List(Text);
 
     enum EnvMode {
-      infer @0;
-      loose @1;
-      strict @2;
+      loose @0;
+      strict @1;
     }
 }