Keep cached WGSL alias redirects live

Author: Milky2018

bevy_wgsl_parity_test.mbt

@@ -85,6 +85,38 @@ test "naga_oil parity: import-only Bevy mesh root tree-shakes to empty" {
   debug_inspect(source.trim().length(), content="0")
 }
 
+///|
+test "naga_oil parity: Bevy PBR fragment resolves aliased clustered lights" {
+  let source = bevy_parity_compose(
+    "bevy_pbr/src/render/pbr.wgsl",
+    bevy_parity_forward_defines(),
+  )
+  debug_inspect(
+    source.contains("view_bindings::clustered_lights"),
+    content="false",
+  )
+  debug_inspect(
+    source.contains("view_bindings__clustered_lights"),
+    content="true",
+  )
+}
+
+///|
+test "naga_oil parity: Bevy PBR functions resolves local view bindings alias" {
+  let source = bevy_parity_compose(
+    "bevy_pbr/src/render/pbr_functions.wgsl",
+    bevy_parity_forward_defines(),
+  )
+  debug_inspect(
+    source.contains("view_bindings::clustered_lights"),
+    content="false",
+  )
+  debug_inspect(
+    source.contains("view_bindings__clustered_lights"),
+    content="true",
+  )
+}
+
 ///|
 test "naga_oil parity: Bevy lighting keeps tree-shaken alias const targets live" {
   let composer = @compose.Composer::default()

compose/import_graph.mbt

@@ -425,10 +425,19 @@ fn collect_wgsl_live_alias_redirects(
   for scoped_redirect in alias_redirects {
     let redirect = scoped_redirect.redirect
     let to_name = redirect.to_name.trim().to_owned()
+    let source_contains_cached_alias = if scoped_redirect.scope ==
+      CachedQualifiedAliasReference {
+      wgsl_semantic_source_contains_reference_path(source, redirect.from_name) catch {
+        error => raise composer_error_from_wgsl_parse_error(error)
+      }
+    } else {
+      false
+    }
     if to_name != "" &&
       (
         declared_names.contains(to_name) ||
-        scoped_redirect.scope == UnqualifiedItemBinding
+        scoped_redirect.scope == UnqualifiedItemBinding ||
+        source_contains_cached_alias
       ) {
       live_redirects.push(redirect)
     }

compose/modules.mbt

@@ -99,7 +99,7 @@ fn collect_wgsl_cached_import_redirects(
     let scope = if alias_name == "" {
       UnqualifiedItemBinding
     } else {
-      QualifiedAliasReference
+      CachedQualifiedAliasReference
     }
     redirects.push(WgslScopedAliasRedirect::{
       redirect: WgslSymbolRedirect::{ from_name, to_name: imported_name },

compose/session.mbt

@@ -131,6 +131,7 @@ priv struct WgslComposeSession {
 ///|
 priv enum WgslAliasRedirectScope {
   QualifiedAliasReference
+  CachedQualifiedAliasReference
   UnqualifiedItemBinding
 } derive(Eq)
 

docs/moon_wgsl-issue-tracker.md

@@ -123,6 +123,7 @@ Last updated: 2026-05-05
 | `WGSL-108` | Architecture risk review | Semantic rewrite still used source-span copy-and-replace in rename/writeback/virtual override paths, so identifier correctness depended on raw source slicing even after AST analysis found the nodes. | `DONE` | Replaced semantic source splices with AST-scoped token rewrites in `analysis` and `virtual_overrides`; writeback sanitizer now inherits the same token emitter through `WgslRenamePlan`. Verified with `moon test --target js`, `moon test --target js README.mbt.md`, `moon check --target all --deny-warn`, `moon info`, `moon ide analyze`, and `tools/check_preprocess_parity.sh` on 2026-05-05. |
 | `WGSL-109` | Architecture risk review | Preprocess and compose still have necessary source-preserving text emission for naga_oil parity, but those paths are not documented as an explicit boundary and can be mistaken for semantic rewrite logic. | `DONE` | Centralized preprocessing and compose source-preserving output behind typed emission actions (`WgslPreprocessEmitAction`, `WgslComposeSourceEmitAction`) so raw `original_text`/blanking behavior is isolated from semantic rewrite packages. Verified with `moon test --target js` on 2026-05-05. |
 | `WGSL-110` | Architecture risk review | Source maps and catalogs now use final prepared WGSL, which fixed runtime alias leakage, but precise mapping back to original dependency files requires a separate origin graph instead of raw source catalogs. | `DONE` | Added `WgslSourceOriginEntry` and `PreparedWgslSource.source_origins`, recorded declaration origins during AST-driven compose/import extraction, and changed export source maps to use the origin graph while keeping `source_catalog` tied to final prepared WGSL. Verified with `moon test --target js` on 2026-05-05. |
+| `WGSL-111` | GitHub issue #8 latest comment | `moon_wgsl 0.7.2` still failed mgstudio's real Bevy PBR fragment path with `failed to resolve shader import: view_bindings::clustered_lights`. The missing case was a cached qualified alias import: one `mesh_view_bindings as view_bindings` import emitted the declarations, while a later module reused only cached redirects, and the live-redirect filter dropped them because the target declarations were not local to that later module. | `DONE` | Added a dedicated `CachedQualifiedAliasReference` scope and kept cached alias redirects when the current AST references the alias path. Added regressions for real `bevy_pbr/src/render/pbr.wgsl` and address-of alias member references. Verified with `moon test --target js`, `moon test --target js README.mbt.md`, `moon check --target all --deny-warn`, and `tools/check_preprocess_parity.sh` on 2026-05-05. |
 
 ## Current work queue
 

semantic/semantic_graph_wbtest.mbt

@@ -28,6 +28,24 @@ test "semantic alias graph resolves global binding member access" {
   debug_inspect(requested_paths.join(","), content="\"clustered_lights\"")
 }
 
+///|
+test "semantic reference matcher includes address-of alias member access" {
+  let source =
+    #|fn point_light(light_id: u32) -> u32 {
+    #|  let light = &view_bindings::clustered_lights.data[light_id];
+    #|  return (*light).flags;
+    #|}
+    #|
+  debug_inspect(
+    wgsl_semantic_source_contains_reference_path(
+      source, "view_bindings::clustered_lights",
+    ) catch {
+      _ => abort("expected semantic matcher to parse valid WGSL")
+    },
+    content="true",
+  )
+}
+
 ///|
 test "semantic alias graph resolves nested module alias paths" {
   let source =