feat(rust-port): Split up shim and cli

CONTRIBUTING.md

@@ -27,7 +27,7 @@ Dependencies
 
    On macOS: `brew install sponge jq`
 
-1. Install [turbo/shim](https://github.com/vercel/turbo/blob/main/shim/README.md) build requirements
+1. Install [turborepo crate](https://github.com/vercel/turbo/blob/main/crates/turborepo/README.md) build requirements
 
 1. Run `pnpm install` at root
 

Cargo.toml

@@ -32,8 +32,9 @@ members = [
   "crates/turbopack-swc-utils",
   "crates/turbopack",
   "crates/turbopack-tests",
+  "crates/turborepo",
+  "crates/turborepo-lib",
   "crates/turbo-updater",
-  "shim",
   "xtask",
 ]
 

cli/Makefile

@@ -20,7 +20,7 @@ SRC_FILES = $(shell find . -name "*.go" | grep -v "_test.go")
 GENERATED_FILES = internal/turbodprotocol/turbod.pb.go internal/turbodprotocol/turbod_grpc.pb.go
 
 turbo: libturbo.a
-	cargo build --manifest-path ../shim/Cargo.toml
+	cargo build --manifest-path ../crates/turborepo/Cargo.toml
 
 libturbo.a: $(GENERATED_FILES) $(SRC_FILES) go.mod
 	go build -buildmode=c-archive -o libturbo.a  ./cmd/turbo/...

cli/cmd/turbo/main.go

@@ -15,14 +15,14 @@ func main() {
 	os.Exit(1)
 }
 
-//export nativeRunWithTurboState
-func nativeRunWithTurboState(turboStateString string) C.uint {
-	var turboState turbostate.CLIExecutionStateFromRust
-	err := json.Unmarshal([]byte(turboStateString), &turboState)
+//export nativeRunWithArgs
+func nativeRunWithArgs(argsString string) C.uint {
+	var args turbostate.ParsedArgsFromRust
+	err := json.Unmarshal([]byte(argsString), &args)
 	if err != nil {
-		fmt.Printf("Error unmarshalling turboState: %v\n Turbo state string: %v\n", err, turboStateString)
+		fmt.Printf("Error unmarshalling CLI args: %v\n Arg string: %v\n", err, argsString)
 		return 1
 	}
-	exitCode := cmd.RunWithTurboState(turboState, turboVersion)
+	exitCode := cmd.RunWithArgs(args, turboVersion)
 	return C.uint(exitCode)
 }

cli/integration_tests/link.t

@@ -3,4 +3,6 @@ Setup
 
 Link Test Run
   $ ${TURBO} link --__test-run
-  Link test run successful
+  Repository inference failed: Unable to find `turbo.json` or `package.json` in current path
+  Running command as global turbo
+  Link test run successful

cli/integration_tests/login.t

@@ -3,4 +3,6 @@ Setup
 
 Login Test Run
   $ ${TURBO} login --__test-run
+  Repository inference failed: Unable to find `turbo.json` or `package.json` in current path
+  Running command as global turbo
   Login test run successful

cli/integration_tests/logout.t

@@ -4,9 +4,13 @@ Setup
 
 Logout while logged in
   $ ${TURBO} logout
+  Repository inference failed: Unable to find `turbo.json` or `package.json` in current path
+  Running command as global turbo
   >>> Logged out
 
 Logout while logged out
   $ ${TURBO} logout
+  Repository inference failed: Unable to find `turbo.json` or `package.json` in current path
+  Running command as global turbo
   >>> Logged out
 

cli/integration_tests/no_args.t

@@ -3,6 +3,8 @@ Setup
 
 Make sure exit code is 2 when no args are passed
   $ ${TURBO}
+  Repository inference failed: Unable to find `turbo.json` or `package.json` in current path
+  Running command as global turbo
   The build system that makes ship happen
 
   Usage: turbo [OPTIONS] [COMMAND]
@@ -31,7 +33,7 @@ Make sure exit code is 2 when no args are passed
         --team <TEAM>                Set the team slug for API calls
         --token <TOKEN>              Set the auth token for API calls
         --trace <TRACE>              Specify a file to save a pprof trace
-    -v, --verbosity <VERBOSITY>      verbosity
+    -v...                            verbosity
     -h, --help                       Print help information
 
   Run Arguments:
@@ -40,6 +42,7 @@ Make sure exit code is 2 when no args are passed
         --concurrency <CONCURRENCY>      Limit the concurrency of task execution. Use 1 for serial (i.e. one-at-a-time) execution
         --continue                       Continue execution even if a task exits with an error or non-zero exit code. The default behavior is to bail
         --dry-run [<DRY_RUN>]            [possible values: text, json]
+        --single-package                 Run turbo in single-package mode
         --filter <FILTER>                Use the given selector to specify package(s) to act as entry points. The syntax mirrors pnpm's syntax, and additional documentation and examples can be found in turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference#--filter
         --force                          Ignore the existing cache (to force execution)
         --global-deps <GLOBAL_DEPS>      Specify glob of global filesystem dependencies to be hashed. Useful for .env and files
@@ -55,5 +58,4 @@ Make sure exit code is 2 when no args are passed
         --remote-only                    Ignore the local filesystem cache for all tasks. Only allow reading and caching artifacts using the remote cache
         --scope <SCOPE>                  Specify package(s) to act as entry points for task execution. Supports globs
         --since <SINCE>                  Limit/Set scope to changed packages since a mergebase. This uses the git diff ${target_branch}... mechanism to identify which packages have changed
-        --single-package                 Run turbo in single-package mode
   [2]