Check imports toplevel too

src/compose/mod.rs

@@ -1583,12 +1583,7 @@ impl Composer {
 
         let sanitized_source = self.sanitize_and_set_auto_bindings(source);
 
-        let PreprocessorMetaData {
-            name,
-            defines,
-            imports,
-            ..
-        } = self
+        let PreprocessorMetaData { name, defines, .. } = self
             .preprocessor
             .get_preprocessor_metadata(&sanitized_source, true)
             .map_err(|inner| ComposerError {
@@ -1603,6 +1598,21 @@ impl Composer {
 
         let name = name.unwrap_or_default();
 
+        let PreprocessOutput {
+            preprocessed_source,
+            imports,
+        } = self
+            .preprocessor
+            .preprocess(&sanitized_source, &shader_defs, self.validate)
+            .map_err(|inner| ComposerError {
+                inner,
+                source: ErrSource::Constructing {
+                    path: file_path.to_owned(),
+                    source: sanitized_source.to_owned(),
+                    offset: 0,
+                },
+            })?;
+
         // make sure imports have been added
         // and gather additional defs specified at module level
         for (import_name, offset) in imports
@@ -1671,21 +1681,6 @@ impl Composer {
             modules: Default::default(),
         };
 
-        let PreprocessOutput {
-            preprocessed_source,
-            imports,
-        } = self
-            .preprocessor
-            .preprocess(&sanitized_source, &shader_defs, self.validate)
-            .map_err(|inner| ComposerError {
-                inner,
-                source: ErrSource::Constructing {
-                    path: file_path.to_owned(),
-                    source: sanitized_source,
-                    offset: 0,
-                },
-            })?;
-
         let composable = self
             .create_composable_module(
                 &definition,

src/compose/test.rs

@@ -1094,6 +1094,74 @@ mod test {
         output_eq!(wgsl, "tests/expected/conditional_import_b.txt");
     }
 
+    #[test]
+    fn conditional_missing_import() {
+        let mut composer = Composer::default();
+
+        composer
+            .add_composable_module(ComposableModuleDescriptor {
+                source: include_str!("tests/conditional_import_fail/mod_a_b.wgsl"),
+                file_path: "tests/conditional_import_fail/mod_a_b.wgsl",
+                ..Default::default()
+            })
+            .unwrap();
+
+        let error = composer
+            .make_naga_module(NagaModuleDescriptor {
+                source: include_str!("tests/conditional_import_fail/top.wgsl"),
+                file_path: "tests/conditional_import_fail/top.wgsl",
+                ..Default::default()
+            })
+            .err()
+            .unwrap();
+
+        let text = error.emit_to_string(&composer);
+
+        // let mut f = std::fs::File::create("conditional_missing_import.txt").unwrap();
+        // f.write_all(text.as_bytes()).unwrap();
+        // drop(f);
+
+        output_eq!(text, "tests/expected/conditional_missing_import.txt");
+    }
+
+    #[test]
+    fn conditional_missing_import_nested() {
+        let mut composer = Composer::default();
+
+        composer
+            .add_composable_module(ComposableModuleDescriptor {
+                source: include_str!("tests/conditional_import_fail/mod_a_b.wgsl"),
+                file_path: "tests/conditional_import_fail/mod_a_b.wgsl",
+                ..Default::default()
+            })
+            .unwrap();
+
+        composer
+            .add_composable_module(ComposableModuleDescriptor {
+                source: include_str!("tests/conditional_import_fail/middle.wgsl"),
+                file_path: "tests/conditional_import_fail/middle.wgsl",
+                ..Default::default()
+            })
+            .unwrap();
+
+        let error = composer
+            .make_naga_module(NagaModuleDescriptor {
+                source: include_str!("tests/conditional_import_fail/top_nested.wgsl"),
+                file_path: "tests/conditional_import_fail/top_nested.wgsl",
+                ..Default::default()
+            })
+            .err()
+            .unwrap();
+
+        let text = error.emit_to_string(&composer);
+
+        // let mut f = std::fs::File::create("conditional_missing_import_nested.txt").unwrap();
+        // f.write_all(text.as_bytes()).unwrap();
+        // drop(f);
+
+        output_eq!(text, "tests/expected/conditional_missing_import_nested.txt");
+    }
+
     #[cfg(feature = "test_shader")]
     #[test]
     fn rusty_imports() {

src/compose/tests/conditional_import_fail/middle.wgsl

@@ -0,0 +1,9 @@
+#define_import_path middle
+
+#ifdef USE_A
+    #import a::b
+#endif
+
+fn mid_fn() -> u32 {
+    return b::C;
+}

src/compose/tests/conditional_import_fail/mod_a_b.wgsl

@@ -0,0 +1,3 @@
+#define_import_path a::b
+
+const C: u32 = 1u;

src/compose/tests/conditional_import_fail/top.wgsl

@@ -0,0 +1,7 @@
+#ifdef USE_A
+    #import a::b
+#endif
+
+fn main() -> u32 {
+    return b::C;
+}

src/compose/tests/conditional_import_fail/top_nested.wgsl

@@ -0,0 +1,5 @@
+#import middle
+
+fn main() -> u32 {
+    return middle::mid_fn();
+}

src/compose/tests/expected/conditional_missing_import.txt

@@ -0,0 +1,8 @@
+error: required import 'b' not found
+  ┌─ tests/conditional_import_fail/top.wgsl:1:1
+  │
+1 │ #ifdef USE_A
+  │ ^
+  │
+  = missing import 'b'
+

src/compose/tests/expected/conditional_missing_import_nested.txt

@@ -0,0 +1,8 @@
+error: required import 'b' not found
+  ┌─ tests/conditional_import_fail/middle.wgsl:1:1
+  │
+1 │ #define_import_path middle
+  │ ^
+  │
+  = missing import 'b'
+