Fixing up and adding tests

Author: NicholasLYang

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

@@ -560,19 +560,29 @@ impl RepositoryQuery {
         Ok(File::new(self.run.clone(), abs_path))
     }
 
+    /// Get the files that have changed between the `base` and `head` commits.
+    ///
+    /// # Arguments
+    ///
+    /// * `base`: Defaults to `main` or `master`
+    /// * `head`: Defaults to `HEAD`
+    /// * `include_uncommitted`: Defaults to `true` if `head` is not provided
+    /// * `allow_unknown_objects`: Defaults to `false`
+    /// * `merge_base`: Defaults to `true`
+    ///
+    /// returns: Result<Array<File>, Error>
     async fn affected_files(
         &self,
         base: Option<String>,
         head: Option<String>,
-        /// Defaults to true if `head` is not provided
         include_uncommitted: Option<bool>,
-        /// Defaults to true
         merge_base: Option<bool>,
     ) -> Result<Array<File>, Error> {
         let base = base.as_deref();
         let head = head.as_deref();
         let include_uncommitted = include_uncommitted.unwrap_or_else(|| head.is_none());
         let merge_base = merge_base.unwrap_or(true);
+
         let repo_root = self.run.repo_root();
         let change_result = self
             .run

turborepo-tests/integration/tests/affected.t

@@ -61,13 +61,21 @@ Do the same thing with the `query` command
   }
 
 Also with `affectedFiles` in `turbo query`
-  $ ${TURBO} query "query { affectedFiles(base: \"main\", head: \"HEAD\") { items { path } } }"
+  $ ${TURBO} query "query { affectedFiles { items { path, affectedPackages { items { name } } } } }"
+   WARNING  query command is experimental and may change in the future
   {
     "data": {
       "affectedFiles": {
         "items": [
           {
-            "path": "apps/my-app/new.js"
+            "path": "apps/my-app/new.js",
+            "affectedPackages": {
+              "items": [
+                {
+                  "name": "my-app"
+                }
+              ]
+            }
           }
         ]
       }
@@ -156,13 +164,21 @@ Do the same thing with the `query` command
   }
 
 Also with `affectedFiles` in `turbo query`
-  $ ${TURBO} query "query { affectedFiles(base: \"main\", head: \"HEAD\") { items { path } } }"
+  $ ${TURBO} query "query { affectedFiles { items { path, affectedPackages { items { name } } } } }"
+   WARNING  query command is experimental and may change in the future
   {
     "data": {
       "affectedFiles": {
         "items": [
           {
-            "path": "apps/my-app/package.json"
+            "path": "apps/my-app/package.json",
+            "affectedPackages": {
+              "items": [
+                {
+                  "name": "my-app"
+                }
+              ]
+            }
           }
         ]
       }
@@ -244,6 +260,17 @@ Do the same thing with the `query` command
     }
   }
 
+Also with `affectedFiles` in `turbo query`
+  $ ${TURBO} query "query { affectedFiles(base: \"HEAD\") { items { path, affectedPackages { items { name } } } } }"
+   WARNING  query command is experimental and may change in the future
+  {
+    "data": {
+      "affectedFiles": {
+        "items": []
+      }
+    }
+  }
+
 Override the SCM head to be main, so nothing runs
   $ TURBO_SCM_HEAD="main" ${TURBO} run build --affected --log-order grouped
   \xe2\x80\xa2 Packages in scope:  (esc)
@@ -275,6 +302,17 @@ Do the same thing with the `query` command
     }
   }
 
+Also with `affectedFiles` in `turbo query`
+  $ ${TURBO} query "query { affectedFiles(head: \"main\") { items { path, affectedPackages { items { name } } } } }"
+   WARNING  query command is experimental and may change in the future
+  {
+    "data": {
+      "affectedFiles": {
+        "items": []
+      }
+    }
+  }
+
 Now add a commit to `main` so the merge base is different from `main`
   $ git checkout main --quiet
   $ echo "foo" >> packages/util/index.js
@@ -324,6 +362,28 @@ Do the same thing with the `query` command
     }
   }
 
+Also with `affectedFiles` in `turbo query`
+  $ ${TURBO} query "query { affectedFiles { items { path, affectedPackages { items { name } } } } }"
+   WARNING  query command is experimental and may change in the future
+  {
+    "data": {
+      "affectedFiles": {
+        "items": [
+          {
+            "path": "apps/my-app/package.json",
+            "affectedPackages": {
+              "items": [
+                {
+                  "name": "my-app"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+
 Now do some magic to change the repo to be shallow
   $ SHALLOW=$(git rev-parse --show-toplevel)/.git/shallow
   $ git rev-parse HEAD > "$SHALLOW"

turborepo-tests/integration/tests/command-query.t

@@ -214,3 +214,28 @@ Run the query
   $ VERSION=${MONOREPO_ROOT_DIR}/version.txt
   $ diff --strip-trailing-cr <(head -n 1 ${VERSION}) <(${TURBO} --version)
 
+Query a file
+  $ ${TURBO} query "query { file(path: \"apps/my-app/package.json\") { path, contents } }"
+   WARNING  query command is experimental and may change in the future
+  {
+    "data": {
+      "file": {
+        "path": "apps/my-app/package.json",
+        "contents": "{\n  \"name\": \"my-app\",\n  \"scripts\": {\n    \"build\": \"echo building\",\n    \"maybefails\": \"exit 4\"\n  },\n  \"dependencies\": {\n    \"util\": \"*\"\n  }\n}\n"
+      }
+    }
+  }
+
+Get the file's package
+  $ ${TURBO} query "query { file(path: \"apps/my-app/package.json\") { path, package { ... on Package { name } } } }"
+   WARNING  query command is experimental and may change in the future
+  {
+    "data": {
+      "file": {
+        "path": "apps/my-app/package.json",
+        "package": {
+          "name": "my-app"
+        }
+      }
+    }
+  }