From 114b51f32b92f203e63be8a80997e66da248fe24 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@sixtyfps.io>
Date: Thu, 16 Jul 2020 18:34:57 +0200
Subject: [PATCH] Add include paths to CompilerConfiguration

We'll try to load .60 files from those paths.
---
 sixtyfps_compiler/diagnostics.rs |  8 ++++++++
 sixtyfps_compiler/lib.rs         | 27 ++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/sixtyfps_compiler/diagnostics.rs b/sixtyfps_compiler/diagnostics.rs
index 936ced7ea..68596521a 100644
--- a/sixtyfps_compiler/diagnostics.rs
+++ b/sixtyfps_compiler/diagnostics.rs
@@ -292,3 +292,11 @@ impl quote::ToTokens for BuildDiagnostics {
         self.iter().for_each(|diag| diag.to_tokens(tokens))
     }
 }
+
+impl Extend<FileDiagnostics> for BuildDiagnostics {
+    fn extend<T: IntoIterator<Item = FileDiagnostics>>(&mut self, iter: T) {
+        for diag in iter {
+            self.add(diag)
+        }
+    }
+}
diff --git a/sixtyfps_compiler/lib.rs b/sixtyfps_compiler/lib.rs
index 3ccae2a9b..3cf833635 100644
--- a/sixtyfps_compiler/lib.rs
+++ b/sixtyfps_compiler/lib.rs
@@ -13,6 +13,8 @@ You should use the `sixtyfps` crate instead
 #[cfg(feature = "proc_macro_span")]
 extern crate proc_macro;
 
+use std::{cell::RefCell, rc::Rc};
+
 pub mod diagnostics;
 pub mod expression_tree;
 pub mod generator;
@@ -43,10 +45,12 @@ mod passes {
 
 #[derive(Default)]
 /// CompilationConfiguration allows configuring different aspects of the compiler.
-pub struct CompilerConfiguration {
+pub struct CompilerConfiguration<'a> {
     /// Indicate whether to embed resources such as images in the generated output or whether
     /// to retain references to the resources on the file system.
     pub embed_resources: bool,
+    /// The compiler will look in these paths for components used in the file to compile.
+    pub include_paths: &'a [&'a std::path::Path],
 }
 
 pub fn compile_syntax_node<DocNode: Into<parser::syntax_nodes::Document>>(
@@ -54,13 +58,30 @@ pub fn compile_syntax_node<DocNode: Into<parser::syntax_nodes::Document>>(
     mut diagnostics: diagnostics::FileDiagnostics,
     compiler_config: &CompilerConfiguration,
 ) -> (object_tree::Document, diagnostics::BuildDiagnostics) {
-    let type_registry = typeregister::TypeRegister::builtin();
+    let mut all_diagnostics = diagnostics::BuildDiagnostics::default();
+
+    let global_type_registry = typeregister::TypeRegister::builtin();
+    let type_registry = if !compiler_config.include_paths.is_empty() {
+        let library = Rc::new(RefCell::new(typeregister::TypeRegister::new(&global_type_registry)));
+
+        all_diagnostics.extend(
+            compiler_config
+                .include_paths
+                .iter()
+                .map(|path| typeregister::TypeRegister::add_from_directory(&library, path))
+                .filter_map(Result::ok)
+                .flatten(),
+        );
+
+        library
+    } else {
+        global_type_registry
+    };
     let doc =
         crate::object_tree::Document::from_node(doc_node.into(), &mut diagnostics, &type_registry);
 
     run_passes(&doc, &mut diagnostics, compiler_config);
 
-    let mut all_diagnostics = diagnostics::BuildDiagnostics::default();
     all_diagnostics.add(diagnostics);
 
     (doc, all_diagnostics)