fix(templateengine+centralui): resolve follow-ups #3 (derived-template collisions) and #7 (sandbox batch/wait surface)

#3 — CollisionDetector counted a derived template's IsInherited placeholder rows as a distinct origin from the parent members the inheritance walk re-adds, reporting a spurious "Naming collision" for every inherited row and blocking any attribute/composition add to a derived template. CollectDirectMembers now skips IsInherited rows on the direct-template and inherited-parent walks; it keeps them for the composed-module walk, where placeholders are the sole representation of a derived module's inherited members (that walk does not climb the composed template's parent chain). #7 — SandboxAttributeAccessor (Central UI Test-Run host) omitted WriteBatchAndWaitAsync / WaitAsync / WaitForAsync, so the editor false-flagged valid instance scripts with CS1061 even though `template validate` and the deploy gate accept them. Added the five overloads mirroring the runtime AttributeAccessor; they throw a labelled ScriptSandboxException if run in Test Run (the central sandbox has no device-batch / event-waiter transport). Tests: +3 CollisionDetector unit + 1 end-to-end TemplateService (derived add now succeeds); +2 ScriptAnalysisService diagnose-clean. Each new test verified to fail without its fix with the exact user-facing symptom. Full suites green (TemplateEngine.Tests 438, CentralUI.Tests 866). Docs: Component-TemplateEngine.md (inherited-placeholder collision rule), Component-ScriptAnalysis.md (third sandbox surface + its compile-clean guard), known-issues tracker #3/#7 marked resolved and the minor note promoted to #8.
2026-06-24 15:03:27 -04:00
parent 1a647cf1c4
commit b3f6833b36
8 changed files with 254 additions and 12 deletions
@@ -677,4 +677,46 @@ public class ScriptAnalysisServiceTests
        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("CS"));
        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("SCADA"));
    }
+
+    // ── Instance-script batch/wait surface (follow-up #7) ─────────────────
+
+    [Fact]
+    public void InstanceScript_BatchAndWaitHelpers_DiagnoseClean()
+    {
+        // Follow-up #7: SandboxAttributeAccessor was missing WriteBatchAndWaitAsync /
+        // WaitAsync / WaitForAsync, so the editor false-flagged valid instance scripts
+        // with CS1061 even though `template validate` and the deploy gate accept them.
+        // The sandbox surface must mirror the runtime AttributeAccessor member-for-member.
+        var code =
+            "var data = new System.Collections.Generic.Dictionary<string, object?> { { \"Cmd\", 1 } };\n" +
+            "var done = await Attributes.WriteBatchAndWaitAsync(data, \"Flag\", true, \"Done\", true, System.TimeSpan.FromSeconds(5));\n" +
+            "var hit  = await Attributes.WaitAsync(\"Done\", true, System.TimeSpan.FromSeconds(5));\n" +
+            "var pred = await Attributes.WaitAsync(\"Done\", v => v != null, System.TimeSpan.FromSeconds(5));\n" +
+            "var res  = await Attributes.WaitForAsync(\"Done\", true, System.TimeSpan.FromSeconds(5));\n" +
+            "return done && hit && pred && res.Matched;";
+        var resp = _svc.Diagnose(new DiagnoseRequest(code));
+
+        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("CS"));
+        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("SCADA"));
+    }
+
+    [Fact]
+    public void ChildInstanceScript_WriteBatchAndWait_DiagnoseClean()
+    {
+        // The same helper on a child composition
+        // (Children["X"].Attributes.WriteBatchAndWaitAsync) — the exact shape used by
+        // the base MESReceiver MoveIn/MoveOut scripts — must also resolve cleanly
+        // through the sandbox composition accessor.
+        var code =
+            "var data = new System.Collections.Generic.Dictionary<string, object?> { { \"MoveInType\", \"Run\" } };\n" +
+            "var ok = await Children[\"RightMESReceiver\"].Attributes.WriteBatchAndWaitAsync(" +
+            "data, \"MoveInFlag\", true, \"MoveInCompleteFlag\", true, System.TimeSpan.FromSeconds(25));\n" +
+            "return ok;";
+        var resp = _svc.Diagnose(new DiagnoseRequest(
+            Code: code,
+            Children: new[] { Comp("RightMESReceiver", attrs: new[] { Attr("MoveInType") }) }));
+
+        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("CS"));
+        Assert.DoesNotContain(resp.Markers, m => m.Code.StartsWith("SCADA"));
+    }
 }