feat: Add imports and string_imports attributes to support non-Bazel directory layouts.

Author: dcarp

d/private/providers.bzl

@@ -3,35 +3,35 @@
 def _dinfo_init(
         *,
         compile_flags = None,
-        import_paths = None,
         imports = None,
+        interface_srcs = None,
         libraries = None,
         linker_flags = None,
         source_only = False,
-        string_import_paths = None,
+        string_imports = None,
         versions = None):
     """Initializes the DInfo provider."""
     return {
         "compile_flags": compile_flags or [],
-        "import_paths": import_paths or depset(),
         "imports": imports or depset(),
+        "interface_srcs": interface_srcs or depset(),
         "libraries": libraries or depset(),
         "linker_flags": linker_flags or [],
         "source_only": source_only,
-        "string_import_paths": string_import_paths or depset(),
+        "string_imports": string_imports or depset(),
         "versions": versions or depset(),
     }
 
 DInfo, _new_dinfo = provider(
     doc = "Provider containing D compilation information",
     fields = {
         "compile_flags": "List of compiler flags.",
-        "import_paths": "A depset of import paths.",
-        "imports": "A depset of imported D files, transitive import included.",
+        "imports": "A depset of import paths.",
+        "interface_srcs": "A depset of interface source files, transitive sources included.",
         "libraries": "A depset of libraries, transitive libraries too.",
         "linker_flags": "List of linker flags, passed directly to the linker.",
         "source_only": "If true, the source files are compiled, but no library is produced.",
-        "string_import_paths": "A depset of string import paths.",
+        "string_imports": "A depset of string import paths.",
         "versions": "A depset of version identifiers.",
     },
     init = _dinfo_init,

d/private/rules/BUILD.bazel

@@ -24,6 +24,7 @@ bzl_library(
     ],
     deps = [
         "//d/private:providers",
+        "@bazel_skylib//lib:paths",
         "@rules_cc//cc/common",
     ],
 )

d/private/rules/common.bzl

@@ -1,5 +1,6 @@
 """Common definitions for D rules."""
 
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//d/private:providers.bzl", "DInfo")
 
@@ -18,6 +19,8 @@ common_attrs = {
         allow_empty = False,
     ),
     "deps": attr.label_list(doc = "List of dependencies.", providers = [[CcInfo], [DInfo]]),
+    "imports": attr.string_list(doc = "List of import paths."),
+    "string_imports": attr.string_list(doc = "List of string import paths."),
     "string_srcs": attr.label_list(doc = "List of string import source files."),
     "versions": attr.string_list(doc = "List of version identifiers."),
     "_linux_constraint": attr.label(default = "@platforms//os:linux", doc = "Linux platform constraint"),
@@ -97,17 +100,21 @@ def compilation_action(ctx, target_type = TARGET_TYPE.LIBRARY):
         for lib in li.libraries
     ])
     d_deps = [d[DInfo] for d in ctx.attr.deps if DInfo in d]
-    import_paths = depset(transitive = [d.import_paths for d in d_deps])
-    string_import_paths = depset(
-        ["."] if ctx.files.string_srcs else [],
-        transitive = [d.string_import_paths for d in d_deps],
+    imports = depset(
+        [paths.join(ctx.label.package, imp) for imp in ctx.attr.imports],
+        transitive = [d.imports for d in d_deps],
+    )
+    string_imports = depset(
+        ([ctx.label_package] if ctx.files.string_srcs else []) +
+        [paths.join(ctx.label.package, imp) for imp in ctx.attr.string_imports],
+        transitive = [d.string_imports for d in d_deps],
     )
     versions = depset(ctx.attr.versions, transitive = [d.versions for d in d_deps])
     args = ctx.actions.args()
     args.add_all(COMPILATION_MODE_FLAGS[ctx.var["COMPILATION_MODE"]])
     args.add_all(ctx.files.srcs)
-    args.add_all(import_paths.to_list(), format_each = "-I=%s")
-    args.add_all(string_import_paths.to_list(), format_each = "-J=%s")
+    args.add_all(imports.to_list(), format_each = "-I=%s")
+    args.add_all(string_imports.to_list(), format_each = "-J=%s")
     args.add_all(toolchain.compiler_flags)
     args.add_all(versions.to_list(), format_each = "-version=%s")
     args.add_all(toolchain.linker_flags)
@@ -131,7 +138,7 @@ def compilation_action(ctx, target_type = TARGET_TYPE.LIBRARY):
         inputs = depset(
             ctx.files.srcs + ctx.files.string_srcs,
             transitive = [toolchain.d_compiler[DefaultInfo].default_runfiles.files] +
-                         [d.imports for d in d_deps] +
+                         [d.interface_srcs for d in d_deps] +
                          [d.libraries for d in d_deps] +
                          [c_libraries],
         ),
@@ -147,23 +154,25 @@ def compilation_action(ctx, target_type = TARGET_TYPE.LIBRARY):
         return [
             DefaultInfo(files = depset([output])),
             DInfo(
-                import_paths = depset(
-                    [ctx.label.package],
-                    transitive = [d.import_paths for d in d_deps],
-                ),
                 imports = depset(
-                    ctx.files.srcs + ctx.files.string_srcs,
+                    [ctx.label.package] +
+                    [paths.join(ctx.label.package, imp) for imp in ctx.attr.imports],
                     transitive = [d.imports for d in d_deps],
                 ),
+                interface_srcs = depset(
+                    ctx.files.srcs + ctx.files.string_srcs,
+                    transitive = [d.interface_srcs for d in d_deps],
+                ),
                 libraries = depset(
                     [] if ctx.attr.source_only else [output],
                     order = "topological",
                     transitive = [d.libraries for d in d_deps] +
                                  [c_libraries],
                 ),
-                string_import_paths = depset(
-                    [ctx.label.package] if ctx.files.string_srcs else [],
-                    transitive = [d.string_import_paths for d in d_deps],
+                string_imports = depset(
+                    ([ctx.label.package] if ctx.files.string_srcs else []) +
+                    [paths.join(ctx.label.package, imp) for imp in ctx.attr.string_imports],
+                    transitive = [d.string_imports for d in d_deps],
                 ),
                 versions = versions,
             ),

d/tests/imports_attribute/BUILD.bazel

@@ -0,0 +1,21 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@rules_d//d:defs.bzl", "d_binary", "d_library")
+
+d_library(
+    name = "no_prefix_import",
+    srcs = ["path1/no_prefix_import.d"],
+    imports = ["path1"],
+)
+
+d_binary(
+    name = "imports_attribute",
+    srcs = [
+        "main.d",
+    ],
+    deps = [":no_prefix_import"],
+)
+
+build_test(
+    name = "imports_attribute_test",
+    targets = [":imports_attribute"],
+)

d/tests/imports_attribute/main.d

@@ -0,0 +1,6 @@
+import no_prefix_import;
+
+void main()
+{
+    no_prefix_import.foo();
+}

d/tests/imports_attribute/path1/no_prefix_import.d

@@ -0,0 +1,6 @@
+import std.stdio;
+
+void foo()
+{
+    writeln("Hello without prefix!");
+}