mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-16 21:02:51 +08:00
e639932b95
# Description
Fixes the SourceGeneration findings of a read-only bug audit of
`a05a36055` — sections 15 (host generators, Roslyn side), 16
(SourceGeneration.Core schema / ModelDesign loader) and 17
(SourceGeneration.Core generators). 36 of the 39 findings are fixed;
each has a regression test.
### Generated-code correctness
- **State machine NodeId constants** were emitted as `const uint` even
when the aliased `Objects` constant is a `string`, so every model using
string NodeIds with a `FiniteStateMachineType` subtype failed with
CS0029. The constant type now follows the aliased node, looked up from
the same source `NodeIdGenerator` emits from — top-level nodes **plus
each node's instance hierarchy**, since a state or transition only ever
exists as a hierarchy entry.
- `NodeIdGenerator` emitted string identifiers into C# string literals
without escaping them.
- Structure field names are authored data, so they can be C# keywords or
collide with the members every generated data type carries. Properties
and `{Type}Fields` members now go through a sanitizing,
collision-breaking mapping (including two siblings that sanitize to the
same identifier). **Wire names are untouched** — OPC 10000-3 §8.51
requires the StructureField name to match the BrowseName, and the
`DataMember`/encode/decode names still come from `Parameter.Name`.
- `NodeStateGenerator`'s copy-on-write cast now uses the fully qualified
data type name, which a cross-model structure needs.
- `GetScalarValueAsCode` emitted `(double)NaN` and the infinities, which
do not compile.
- `TemplateWriter` formatted with the current culture, so a machine with
a comma decimal separator emitted invalid generated source.
### Served schema documents
- The binary schema described a **different wire layout than the
generated `Encode`/`Decode`**: unions carried no
`SwitchField`/`SwitchValue`, and structures with optional fields carried
no encoding-mask presence bits. Both are now emitted per **OPC 10000-6
§5.2.7**, matching the layout the runtime `BsdSchemaGenerator` produces.
A structure with more than 32 optional fields now fails generation
instead of silently wrapping `1 << 32` back onto the first field's bit.
- Documentation text and attribute values are XML-escaped.
### ModelDesign loading and validation
- Identifiers pinned in a CSV were dropped whenever any other loaded
namespace declared the same symbolic name. Removal is now scoped to the
file's target namespace, and explicit `NumericId`s are keyed by
`(namespace, id)` so the same number in two namespaces is legal.
- Declaration order inside a design file no longer matters — base types
are imported and validated ahead of their subtypes.
- OptionSet `OptionSetValues` were truncated at bit 31 (signed shift)
and bits 32–63 of a 64-bit option set were never emitted.
- An authored `ValueRank` is no longer overwritten by the shape of the
default value (OPC 10000-3 §6.2.8: a ValueRank may only be further
restricted), and a VariableType data type may be narrowed any number of
levels deep rather than exactly one.
- NodeSet import: `AccessRestrictions="0"` means "no restrictions", not
`EncryptionRequired` (OPC 10000-3 §8.56) — an unrecognised mask stays
**fail-closed**; a NodeSet without `<Models>` reports what is wrong; an
optional `<References>` no longer throws; the parent/child reference
scan looks at the parent's references; and `IsTypeOf` terminates on the
self-referential root reference types NodeSets routinely declare.
- Version comparison is numeric per component (ordinally `"1.05.9"`
sorts above `"1.05.10"`) and now lives on `SemVer`, so the NodeSet
collection and the dependency tie-break cannot pick different winners; a
publication-date version no longer outranks a real one.
### Host generator
- `[DataType]` on an `enum` is matched again (an enum is not a
`TypeDeclarationSyntax`), MODELGEN003 renders its arguments instead of
the raw template, and the Types hint name keeps the namespace's dots so
`A.BC` and `AB.C` cannot claim the same one.
- Compilation-derived pipeline stages carry value comparers, so editing
a file no longer re-runs the entire model generation on every keystroke.
- A NodeSet that fails to load skips that file rather than every
remaining one; a file listed twice as an `AdditionalFile` is deduped;
superseded NodeSet versions are still recognised as NodeSet inputs and
not generated a second time by the ModelDesign pass.
- `LogLevel.Critical` maps to a diagnostic instead of being silently
dropped.
### Client
- `EventRecordFieldReaders` gained the readers the event record
generator needs (including `Variant`, enumerations and the array forms).
Fields whose type had no reader were declared on the record but never
populated, so they read as `null`/`default` for every event.
## Not fixed (deliberately)
- **Forward same-namespace hierarchical references in
`NodeSetToModelDesign.ImportReferences`** — the audit flags the
inverse-only handling as asymmetric. Making it symmetric compiles and
passes every generator unit test, but regresses the address space: all
17 `RobotOpenUsdE2eTests` fail in `OneTimeSetUpAsync` because the hosted
server never finishes starting. Reverted, with a comment at the site
recording why.
- **§17.10 and §15.10** (both low + PLAUSIBLE) — each needs a wider
refactor than this PR: a consistent NodeId-constant rename across ~6
cross-reference sites, and replacing `Location` with a serializable
equivalent for incremental cache equality.
## Spec cross-check
The encoding/schema changes were checked against the specification: OPC
10000-6 §5.2.7 (32-bit EncodingMask, one bit per optional field in
order, padded), the union `SwitchField` encoding, OPC 10000-3 §8.56
(AccessRestrictionType bit mask), §6.2.8 and §5.6.2/§5.6.5 (ValueRank),
§8.51 (StructureField name == BrowseName).
`GenerateStackTests.OptionalFieldBitsAgreeBetweenBsdAndGeneratedEncoder`
pins the BSD presence-bit order against the generated encoder's
`LogRecordFields` so the two cannot drift apart again.
## Related Issues
_No tracking issue — this PR implements the SourceGeneration sections of
a bug audit. Happy to open one if maintainers prefer._
## Checklist
- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
> Note on the test checkbox: verified on **net10.0 only** — `UA.slnx`
builds clean (0 warnings, 0 errors) and
`Opc.Ua.SourceGeneration.Core.Tests` (3915),
`Opc.Ua.SourceGeneration.Tests` (184), `Opc.Ua.Di.Tests` (425, including
the `RobotOpenUsdE2eTests` end-to-end fixture that catches address-space
content changes) and the `EventRecordFieldReaders` tests (16) all pass.
.NET Framework has **not** been run locally; CI needs to confirm it.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
365 lines
15 KiB
C#
365 lines
15 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.Generic;
|
|
using System.Diagnostics;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using System.Xml.Linq;
|
|
using BenchmarkDotNet.Attributes;
|
|
using Microsoft.CodeAnalysis;
|
|
using Microsoft.CodeAnalysis.CSharp;
|
|
using Microsoft.CodeAnalysis.Diagnostics;
|
|
using Microsoft.Extensions.Logging;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Api.Tests
|
|
{
|
|
/// <summary>
|
|
/// Test generating and compiling stack
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Api")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
[MemoryDiagnoser]
|
|
[DisassemblyDiagnoser]
|
|
// [Parallelizable(ParallelScope.All)]
|
|
public class GenerateStackTests
|
|
{
|
|
[DatapointSource]
|
|
public OptimizationLevel[] OptimizationLevels = CompilerUtils.SupportedOptimizationLevels;
|
|
|
|
[DatapointSource]
|
|
public StackGenerationType[] GenerationTypes =
|
|
[
|
|
StackGenerationType.None,
|
|
StackGenerationType.Stack,
|
|
StackGenerationType.Models,
|
|
StackGenerationType.All
|
|
];
|
|
|
|
[Theory]
|
|
public void GenerateStackTest(StackGenerationType generationType)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
GenerateStack(generationType, telemetry, out _);
|
|
}
|
|
|
|
[Test]
|
|
public void EncodedTicketUsesByteStringSupertype()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
Dictionary<string, string> generatedText = GenerateStack(
|
|
StackGenerationType.Models,
|
|
telemetry,
|
|
out _);
|
|
string nodeStates = generatedText.Single(pair =>
|
|
pair.Key.EndsWith(
|
|
"Opc.Ua.NodeStates.ex.g.cs",
|
|
System.StringComparison.Ordinal)).Value;
|
|
const string declaration =
|
|
"internal static global::Opc.Ua.DataTypeState CreateEncodedTicket(";
|
|
int declarationIndex = nodeStates.IndexOf(
|
|
declaration,
|
|
System.StringComparison.Ordinal);
|
|
|
|
Assert.That(declarationIndex, Is.GreaterThanOrEqualTo(0));
|
|
int initializerEnd = System.Math.Min(
|
|
declarationIndex + 1500,
|
|
nodeStates.Length);
|
|
string encodedTicketInitializer =
|
|
nodeStates[declarationIndex..initializerEnd];
|
|
Assert.That(
|
|
encodedTicketInitializer,
|
|
Does.Contain("state.SuperTypeId = global::Opc.Ua.NodeId.Create(15u,"));
|
|
}
|
|
|
|
/// <summary>
|
|
/// The served DataTypeDictionary must describe the layout the generated
|
|
/// Encode/Decode actually produces. OPC 10000-6 §5.2.7 assigns the first
|
|
/// optional field bit '0', the second bit '1' and so on - counting
|
|
/// optional fields only - and pads the mask to 32 bits. LogRecord is the
|
|
/// standard model's structure with optional fields, and it interleaves
|
|
/// them with mandatory ones, so it pins the bit order on both sides.
|
|
/// </summary>
|
|
[Test]
|
|
public void OptionalFieldBitsAgreeBetweenBsdAndGeneratedEncoder()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
Dictionary<string, string> generatedText = GenerateStack(
|
|
StackGenerationType.All,
|
|
telemetry,
|
|
out Dictionary<string, string> nonSourceCode);
|
|
|
|
string bsd = nonSourceCode.Single(pair =>
|
|
pair.Key.EndsWith(".Types.bsd", StringComparison.Ordinal)).Value;
|
|
string dataTypes = generatedText.Single(pair =>
|
|
pair.Key.EndsWith("Opc.Ua.DataTypes.g.cs", StringComparison.Ordinal)).Value;
|
|
|
|
// The presence bits, in the order the binary schema declares them.
|
|
string logRecord = Between(
|
|
bsd,
|
|
"<opc:StructuredType Name=\"LogRecord\"",
|
|
"</opc:StructuredType>");
|
|
var bsdBits = new List<string>();
|
|
foreach (string line in logRecord.Split('\n'))
|
|
{
|
|
if (line.Contains("TypeName=\"opc:Bit\"", StringComparison.Ordinal) &&
|
|
!line.Contains("Name=\"Reserved", StringComparison.Ordinal))
|
|
{
|
|
bsdBits.Add(Between(line, "Name=\"", "\"").Replace(
|
|
"Specified", string.Empty, StringComparison.Ordinal));
|
|
}
|
|
}
|
|
|
|
string[] expectedBits =
|
|
[
|
|
"EventType", "SourceNode", "SourceName", "TraceContext", "AdditionalData"
|
|
];
|
|
Assert.That(
|
|
bsdBits,
|
|
Is.EqualTo(expectedBits),
|
|
"presence bits are the optional fields, in declaration order");
|
|
|
|
// The mask is padded out to the 32 bits the encoding uses.
|
|
Assert.That(
|
|
logRecord,
|
|
Does.Contain("<opc:Field Name=\"Reserved1\" TypeName=\"opc:Bit\" Length=\"27\" />"));
|
|
|
|
// Every optional data field selects on its own presence bit.
|
|
foreach (string name in bsdBits)
|
|
{
|
|
Assert.That(
|
|
logRecord,
|
|
Does.Contain($"SwitchField=\"{name}Specified\""),
|
|
$"'{name}' must select on its presence bit");
|
|
}
|
|
|
|
// And the generated encoder assigns those same bits, in that order.
|
|
string maskEnum = Between(
|
|
dataTypes, "public enum LogRecordFields : uint", "}");
|
|
var encoderBits = new List<string>();
|
|
foreach (string line in maskEnum.Split('\n'))
|
|
{
|
|
int at = line.IndexOf(" = 0x", StringComparison.Ordinal);
|
|
if (at > 0)
|
|
{
|
|
encoderBits.Add(line.Trim()[..line.Trim()
|
|
.IndexOf(" = 0x", StringComparison.Ordinal)]);
|
|
}
|
|
}
|
|
|
|
Assert.That(
|
|
encoderBits,
|
|
Is.EqualTo(bsdBits),
|
|
"the dictionary and the generated encoder must agree on the bit order");
|
|
Assert.That(maskEnum, Does.Contain("EventType = 0x1"));
|
|
Assert.That(maskEnum, Does.Contain("AdditionalData = 0x10"));
|
|
}
|
|
|
|
private static string Between(string source, string start, string end)
|
|
{
|
|
int at = source.IndexOf(start, StringComparison.Ordinal);
|
|
Assert.That(at, Is.GreaterThanOrEqualTo(0), $"'{start}' not found");
|
|
at += start.Length;
|
|
int to = source.IndexOf(end, at, StringComparison.Ordinal);
|
|
Assert.That(to, Is.GreaterThanOrEqualTo(0), $"'{end}' not found");
|
|
return source[at..to];
|
|
}
|
|
|
|
[Theory]
|
|
public async Task GenerateAndCompileStackTestAsync(
|
|
OptimizationLevel optimizationLevel,
|
|
bool withAnalyzers,
|
|
bool withNodeLoader)
|
|
{
|
|
// Generate
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
Dictionary<string, string> generatedText = GenerateStack(StackGenerationType.All, telemetry, out _);
|
|
if (withNodeLoader)
|
|
{
|
|
AddPredefinedNodeLoader(generatedText);
|
|
}
|
|
|
|
// Parse and compile the generated code
|
|
var sw = Stopwatch.StartNew();
|
|
using var peStream = new MemoryStream();
|
|
using var xmlStream = new MemoryStream();
|
|
bool success = optimizationLevel
|
|
.CreateCompilation()
|
|
.AddCode(
|
|
generatedText.WithOpcUaCoreStubs(
|
|
includeBaseEventTypeRecord: false),
|
|
LanguageVersion.Latest) // Only support latest - internal use only
|
|
.WithAnalyzers(withAnalyzers, out CompilationWithAnalyzers compilationWithAnalyzers)
|
|
.Emit(peStream, xmlDocumentationStream: xmlStream)
|
|
.Check(TestContext.Out, out int errorCount, out int warnCount);
|
|
TestContext.Out.WriteLine("Compilation completed in {0} ms", sw.ElapsedMilliseconds);
|
|
if (withAnalyzers)
|
|
{
|
|
if (compilationWithAnalyzers == null)
|
|
{
|
|
Assert.Ignore("Setup does not support analyzer testing");
|
|
}
|
|
AnalysisResult analysisResults =
|
|
await compilationWithAnalyzers.GetAnalysisResultAsync(default).ConfigureAwait(false);
|
|
analysisResults.GetAllDiagnostics().Check(TestContext.Out,
|
|
out int analyzerErrors,
|
|
out int analzyerWarnings);
|
|
Assert.That(analyzerErrors, Is.Zero, $"Analyzers produced {analyzerErrors} errors");
|
|
TestContext.Out.WriteLine($"Analyzers produced {analzyerWarnings} warnings");
|
|
}
|
|
Assert.That(
|
|
success,
|
|
Is.True,
|
|
$"Compilation failed with {errorCount} errors and {warnCount} warnings.");
|
|
xmlStream.Position = 0;
|
|
var xmlDoc = XDocument.Load(xmlStream);
|
|
Assert.That(xmlDoc, Is.Not.Null);
|
|
}
|
|
|
|
[GlobalSetup(Target = nameof(GenerateToFile))]
|
|
[GlobalCleanup(Target = nameof(GenerateToFile))]
|
|
#pragma warning disable NUnit1028 // The non-test method is public
|
|
public void Setup()
|
|
#pragma warning restore NUnit1028 // The non-test method is public
|
|
{
|
|
try
|
|
{
|
|
Directory.Delete(Path.Combine(Directory.GetCurrentDirectory(), "Benchmark"), true);
|
|
}
|
|
catch
|
|
{
|
|
// Ignore
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
#pragma warning disable NUnit1028 // The non-test method is public
|
|
public void GenerateToFile()
|
|
#pragma warning restore NUnit1028 // The non-test method is public
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.CreateForBenchmarks(logLevel: LogLevel.Error);
|
|
Generators.GenerateStack(
|
|
StackGenerationType.All,
|
|
LocalFileSystem.Instance,
|
|
Path.Combine(Directory.GetCurrentDirectory(), "Benchmark"), telemetry);
|
|
}
|
|
|
|
[Benchmark]
|
|
#pragma warning disable NUnit1028 // The non-test method is public
|
|
public void GenerateToMemory()
|
|
#pragma warning restore NUnit1028 // The non-test method is public
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.CreateForBenchmarks(logLevel: LogLevel.Error);
|
|
GenerateStack(StackGenerationType.All, telemetry, out _);
|
|
}
|
|
|
|
[Benchmark]
|
|
[Arguments(OptimizationLevel.Release)]
|
|
[Arguments(OptimizationLevel.Debug)]
|
|
#pragma warning disable NUnit1028 // The non-test method is public
|
|
public void GenerateAndComile(OptimizationLevel optimizationLevel)
|
|
#pragma warning restore NUnit1028 // The non-test method is public
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.CreateForBenchmarks(logLevel: LogLevel.Error);
|
|
Dictionary<string, string> generatedText = GenerateStack(StackGenerationType.All, telemetry, out _);
|
|
using var peStream = new MemoryStream();
|
|
using var xmlStream = new MemoryStream();
|
|
bool success = optimizationLevel
|
|
.CreateCompilation("Opc.Ua.Test")
|
|
.AddCode(
|
|
generatedText.WithOpcUaCoreStubs(
|
|
includeBaseEventTypeRecord: false),
|
|
LanguageVersion.Latest)
|
|
.Emit(peStream, xmlDocumentationStream: xmlStream)
|
|
.Check(TestContext.Out, out int errorCount, out int warnCount);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Generate stack code
|
|
/// </summary>
|
|
#pragma warning disable NUnit1028 // The non-test method is public
|
|
internal static Dictionary<string, string> GenerateStack(
|
|
#pragma warning restore NUnit1028 // The non-test method is public
|
|
StackGenerationType generationType,
|
|
ITelemetryContext telemetry,
|
|
out Dictionary<string, string> nonSourceCode)
|
|
{
|
|
// Generate
|
|
var sw = Stopwatch.StartNew();
|
|
using var fileSystem = new VirtualFileSystem();
|
|
// The test compilation provides Core stubs via
|
|
// WithOpcUaCoreStubs() but no Opc.Ua.Server reference.
|
|
// Suppress fluent-builder emission to keep the generated
|
|
// code self-contained (mirrors model-only csproj
|
|
// configuration in production).
|
|
Generators.GenerateStack(generationType, fileSystem, string.Empty, telemetry,
|
|
new GeneratorOptions
|
|
{
|
|
OmitFluentApi = true
|
|
});
|
|
var generatedText = fileSystem.CreatedFiles
|
|
.Where(c => Path.GetExtension(c) == ".cs")
|
|
.ToDictionary(c => c, c => Encoding.UTF8.GetString(fileSystem.Get(c)));
|
|
|
|
TestContext.Out.WriteLine("Generation completed in {0} ms", sw.ElapsedMilliseconds);
|
|
Assert.That(generatedText.Values, Is.All.StartsWith("// <auto-generated />"));
|
|
|
|
nonSourceCode = fileSystem.CreatedFiles
|
|
.Where(c => Path.GetExtension(c) != ".cs")
|
|
.ToDictionary(c => c, c => Encoding.UTF8.GetString(fileSystem.Get(c)));
|
|
return generatedText;
|
|
}
|
|
|
|
private static void AddPredefinedNodeLoader(Dictionary<string, string> generated)
|
|
{
|
|
generated.Add("Test.cs",
|
|
"""
|
|
namespace Opc.Ua
|
|
{
|
|
public static partial class LoadingTestData
|
|
{
|
|
public static NodeStateCollection Load()
|
|
{
|
|
// Use predefined nodes
|
|
return new NodeStateCollection().AddOpcUa(new SystemContext(null));
|
|
}
|
|
}
|
|
}
|
|
""");
|
|
}
|
|
}
|
|
}
|