mdbook: fix support for external repositories

extensions/mdbook/private/mdbook.bzl

@@ -10,7 +10,15 @@ MdBookInfo = provider(
 )
 
 def _map_inputs(file):
-    return "{}={}".format(file.path, file.short_path)
+    dest = file.short_path
+    if dest.startswith("../"):
+        # External repositories have short_paths starting with '../'.
+        # We need them to be staged at 'external/' within our shadow
+        # directory to match how 'file.path' (and thus 'file.dirname')
+        # refers to them.
+        dest = "external/" + dest.removeprefix("../")
+
+    return "{}={}".format(file.path, dest)
 
 def _mdbook_impl(ctx):
     output = ctx.actions.declare_directory(ctx.label.name)

extensions/mdbook/private/process_wrapper.rs

@@ -73,6 +73,17 @@ fn generate_work_dir(output_dir: &Path, inputs_manifest: &BTreeMap<PathBuf, Path
 
     for (src, dest) in inputs_manifest.iter() {
         let abs_dest = workdir.join(dest);
+
+        // Ensure the destination is within the workdir
+        if !abs_dest.starts_with(&workdir) {
+            panic!(
+                "Attempted to stage file outside of workdir: {} -> {} (dest: {})",
+                src.display(),
+                abs_dest.display(),
+                dest.display()
+            );
+        }
+
         fs::create_dir_all(abs_dest.parent().unwrap()).unwrap();
         fs::copy(src, &abs_dest).unwrap_or_else(|e| {
             panic!(

extensions/mdbook/test/external_srcs/BUILD.bazel

@@ -0,0 +1,35 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@rules_rust//rust:defs.bzl", "rust_test")
+load("//:defs.bzl", "mdbook")
+
+mdbook(
+    name = "external_srcs",
+    srcs = ["//test/external_srcs/content:srcs"],
+    book = "//test/external_srcs/content:book.toml",
+)
+
+mdbook(
+    name = "local_book_mixed",
+    srcs = ["//test/external_srcs/content:srcs"],
+    book = "//test/external_srcs/local_book_mixed:book.toml",
+)
+
+rust_test(
+    name = "external_srcs_test",
+    srcs = ["external_srcs_test.rs"],
+    data = [
+        ":external_srcs",
+        ":local_book_mixed",
+    ],
+    edition = "2021",
+    rustc_env = {
+        "MDBOOK_EXTERNAL_SRCS_OUTPUT": "$(rlocationpath :external_srcs)",
+        "MDBOOK_LOCAL_BOOK_MIXED_OUTPUT": "$(rlocationpath :local_book_mixed)",
+    },
+    deps = ["@rules_rust//rust/runfiles"],
+)
+
+build_test(
+    name = "external_srcs_build_test",
+    targets = [":external_srcs"],
+)

extensions/mdbook/test/external_srcs/content/BUILD.bazel

@@ -0,0 +1,7 @@
+exports_files(["book.toml"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["src/**/*.md"]),
+    visibility = ["//visibility:public"],
+)

extensions/mdbook/test/external_srcs/content/book.toml

@@ -0,0 +1,5 @@
+[book]
+authors = ["Test Author"]
+language = "en"
+src = "src"
+title = "External Book"

extensions/mdbook/test/external_srcs/content/src/SUMMARY.md

@@ -0,0 +1,3 @@
+# Summary
+
+[Test Chapter](test.md)

extensions/mdbook/test/external_srcs/content/src/test.md

@@ -0,0 +1,3 @@
+# Test Chapter
+
+This is a test.

extensions/mdbook/test/external_srcs/external_srcs_test.rs

@@ -0,0 +1,24 @@
+use runfiles::{rlocation, Runfiles};
+use std::fs;
+
+#[test]
+fn test_external_srcs_output() {
+    let r = Runfiles::create().unwrap();
+
+    let dir = rlocation!(r, env!("MDBOOK_EXTERNAL_SRCS_OUTPUT")).unwrap();
+
+    let test_chapter = dir.join("test.html");
+    let content = fs::read_to_string(test_chapter).unwrap();
+    assert!(content.contains("This is a test."));
+}
+
+#[test]
+fn test_local_book_mixed_output() {
+    let r = Runfiles::create().unwrap();
+
+    let dir = rlocation!(r, env!("MDBOOK_LOCAL_BOOK_MIXED_OUTPUT")).unwrap();
+
+    let test_chapter = dir.join("test.html");
+    let content = fs::read_to_string(test_chapter).unwrap();
+    assert!(content.contains("This is a test."));
+}

extensions/mdbook/test/external_srcs/local_book_mixed/BUILD.bazel

@@ -0,0 +1 @@
+exports_files(["book.toml"])

extensions/mdbook/test/external_srcs/local_book_mixed/book.toml

@@ -0,0 +1,5 @@
+[book]
+authors = ["Test Author"]
+language = "en"
+src = "../content/src"
+title = "Local Book Mixed"