mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +08:00
66be6731f4
## Summary Combines the compiled companion-model support from #4062 with the NodeState emission fixes already in this PR. The model source generator can now consume compiled companion `NodeSet2` models more reliably, while generated factories consistently target base `NodeState` members even when a generated subclass shadows them. ## Changes ### Compiled companion NodeSets - Add `OpcUaStateTypeIndex` and wire it through `ModelSourceGenerator` / `ModelCompilation` so standard (`ns=0`) node-state and method-state class names are resolved from referenced `Opc.Ua.Core(.Types)` metadata. - Add the model-generation-scoped `StandardMethodStateFallback`, which degrades an unresolved standard typed `*MethodState` reference to `global::Opc.Ua.MethodState` only when the type is neither available in the compilation nor declared by the current generation pass. - Keep declaration names outside the reference-only fallback policy, propagate fallback state through the logical execution context, reuse the immutable availability index, and use named incremental-generator inputs instead of deep `Left` / `Right` chains. - Escape generated fluent-builder XML documentation where browse names can contain XML-sensitive characters. ### Safe NodeState factory emission - Declare one base-typed `global::Opc.Ua.NodeState nodeState = state;` local per generated factory. - Use `nodeState` for base-member reads and writes to `NodeId`, `SymbolicName`, `BrowseName`, `DisplayName`, `Description`, `WriteMask`, `UserWriteMask`, `AccessRestrictions`, `ReleaseStatus`, `Categories`, `Specification` and `IsPartOfTypeHierarchy`. - Base-qualify the optional-child `previousNodeId` read, NodeId comparison, and existing-child NodeId update. - `global::`-qualify emitted `NodeId` / `ExpandedNodeId` namespace prefixes to avoid namespace collisions. ### Supporting updates - Expose `Opc.Ua.Types` internals to `Opc.Ua.Core.Encoders.Tests`. - Update generator assertions and add focused fallback regression coverage. ## Why Compiled companion models can instantiate standard types whose curated Core implementation does not expose the conventionally named typed method-state class. The scoped fallback lets those models generate without weakening the Stack generator or masking classes emitted by the current model. Separately, generated subclasses can shadow base `NodeState` properties with strongly typed `new` properties. Routing base attributes through a `NodeState`-typed local guarantees initialization reaches the intended base member while keeping generated code smaller and clearer than repeated casts. ## Validation - Full `Opc.Ua.SourceGeneration.Core.Tests` on net10.0: **3718 passed / 8 skipped / 0 failed**. - Combined focused generator coverage on net48: **21 passed / 0 failed**. - Full `Opc.Ua.SourceGeneration.Tests`: **68 passed / 0 failed**. - Full `Opc.Ua.SourceGeneration.Stack.Tests`: **90 passed / 0 failed**. ## Context This PR supersedes #4062 and contains both source-generator change sets. The companion-model fallback remains the scoped interim workaround tracked by #4060; a future upstream name-resolution step can remove it. These changes also feed the experimental data-encodings work in #4007. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
154 lines
5.8 KiB
C#
154 lines
5.8 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Immutable;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using System.Xml;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Schema.Model;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Tests
|
|
{
|
|
[TestFixture]
|
|
[Category("Generator")]
|
|
[Parallelizable]
|
|
public sealed class StandardMethodStateFallbackTests
|
|
{
|
|
/// <summary>
|
|
/// Verifies that the fallback scope follows the logical execution
|
|
/// context when generator work moves to another thread.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task FallbackScopeFlowsToDedicatedThreadAsync()
|
|
{
|
|
int sourceThreadId = Environment.CurrentManagedThreadId;
|
|
using IDisposable scope = StandardMethodStateFallback.Enter(
|
|
ImmutableHashSet<string>.Empty);
|
|
|
|
(bool shouldFallback, int threadId) = await Task.Factory.StartNew(
|
|
() => (
|
|
StandardMethodStateFallback.ShouldFallBackToBase(
|
|
"global::Opc.Ua.MissingMethodState"),
|
|
Environment.CurrentManagedThreadId),
|
|
CancellationToken.None,
|
|
TaskCreationOptions.LongRunning,
|
|
TaskScheduler.Default).ConfigureAwait(false);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(threadId, Is.Not.EqualTo(sourceThreadId));
|
|
Assert.That(shouldFallback, Is.True);
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that declaration names can opt out of the reference-only
|
|
/// fallback policy.
|
|
/// </summary>
|
|
[Test]
|
|
public void DeclarationNameDoesNotApplyFallback()
|
|
{
|
|
const string namespaceUri = "http://opcfoundation.org/UA/";
|
|
var method = new MethodDesign
|
|
{
|
|
HasArguments = true,
|
|
SymbolicName = new XmlQualifiedName("Missing", namespaceUri)
|
|
};
|
|
Namespace[] namespaces =
|
|
[
|
|
new Namespace
|
|
{
|
|
Value = namespaceUri,
|
|
Prefix = "Opc.Ua"
|
|
}
|
|
];
|
|
using IDisposable scope = StandardMethodStateFallback.Enter(
|
|
ImmutableHashSet<string>.Empty);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(
|
|
method.GetNodeStateClassName(namespaceUri, namespaces),
|
|
Is.EqualTo("global::Opc.Ua.MethodState"));
|
|
Assert.That(
|
|
method.GetNodeStateClassName(
|
|
namespaceUri,
|
|
namespaces,
|
|
applyStandardFallback: false),
|
|
Is.EqualTo("global::Opc.Ua.MissingMethodState"));
|
|
Assert.That(
|
|
method.GetNodeStateClassName(
|
|
namespaceUri,
|
|
[],
|
|
applyStandardFallback: false),
|
|
Is.EqualTo("MissingMethodState"));
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that disposing a nested fallback scope restores the outer
|
|
/// immutable availability index.
|
|
/// </summary>
|
|
[Test]
|
|
public void NestedScopeRestoresOuterAvailabilityIndex()
|
|
{
|
|
ImmutableHashSet<string> availableStateTypeNames =
|
|
ImmutableHashSet<string>.Empty.Add("KnownMethodState");
|
|
|
|
using (StandardMethodStateFallback.Enter(availableStateTypeNames))
|
|
{
|
|
Assert.That(
|
|
StandardMethodStateFallback.ShouldFallBackToBase(
|
|
"global::Opc.Ua.KnownMethodState"),
|
|
Is.False);
|
|
|
|
using (StandardMethodStateFallback.Enter(ImmutableHashSet<string>.Empty))
|
|
{
|
|
Assert.That(
|
|
StandardMethodStateFallback.ShouldFallBackToBase(
|
|
"global::Opc.Ua.KnownMethodState"),
|
|
Is.True);
|
|
}
|
|
|
|
Assert.That(
|
|
StandardMethodStateFallback.ShouldFallBackToBase(
|
|
"global::Opc.Ua.KnownMethodState"),
|
|
Is.False);
|
|
}
|
|
|
|
Assert.That(
|
|
StandardMethodStateFallback.ShouldFallBackToBase(
|
|
"global::Opc.Ua.KnownMethodState"),
|
|
Is.False);
|
|
}
|
|
}
|
|
}
|