From 027d73dea19c4154d27c77cd82dd4b28649cdf3f Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 12 Jan 2025 15:11:04 +0000 Subject: Support recursive project dependencies --- .../java/org/shedlang/compiler/ShedCompiler.java | 30 +++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/ShedCompiler.java') diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java index af47ff5c..34cdad23 100644 --- a/src/main/java/org/shedlang/compiler/ShedCompiler.java +++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java @@ -36,12 +36,7 @@ public class ShedCompiler { ) throws IOException, InterruptedException { var config = ProjectConfig.read(projectRoot); - // TODO: recursive dependencies - var projectRoots = new ArrayList(); - projectRoots.add(projectRoot); - for (var dependency : config.dependencies()) { - projectRoots.add(dependency.path()); - } + var projectRoots = findProjectRoots(config); var untypedNamespaceNodes = projectRoots.stream() .flatMap(root -> { @@ -102,6 +97,29 @@ public class ShedCompiler { ); } + /** + * Find the roots of any projects that require compilation, including + * transitive dependencies. + */ + private LinkedHashSet findProjectRoots(ProjectConfig config) throws IOException { + var projectRoots = new LinkedHashSet(); + var pendingProjects = new ArrayDeque(); + pendingProjects.add(config.root()); + // TODO: detect cycles + + while (!pendingProjects.isEmpty()) { + var projectRoot = pendingProjects.removeFirst(); + if (projectRoots.add(projectRoot)) { + var projectConfig = ProjectConfig.read(projectRoot); + for (var dependency : projectConfig.dependencies()) { + pendingProjects.add(dependency.path()); + } + } + } + + return projectRoots; + } + private List collectSourceFilePaths(Path sourceRoot) throws IOException { var paths = new ArrayList(); Files.walkFileTree(sourceRoot, new SimpleFileVisitor() { -- cgit v1.2.3