mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 13:10:37 +08:00
# 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>
279 lines
11 KiB
C#
279 lines
11 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.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using Microsoft.Extensions.Logging;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Tests for how <see cref="NodesetFileCollection"/> resolves several
|
|
/// NodeSet2 inputs that declare the same model URI.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("SourceGeneration")]
|
|
[SetCulture("en-us")]
|
|
[SetUICulture("en-us")]
|
|
public class NodesetFileCollectionTests
|
|
{
|
|
private const string ModelUri = "http://test.org/UA/Versioned/";
|
|
|
|
private VirtualFileSystem m_fileSystem;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
m_fileSystem = new VirtualFileSystem();
|
|
}
|
|
|
|
[TearDown]
|
|
public void TearDown()
|
|
{
|
|
m_fileSystem?.Dispose();
|
|
m_fileSystem = null;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: versions were compared as ordinal text, under which
|
|
/// "1.05.9" sorts above "1.05.10", so the older NodeSet won.
|
|
/// </summary>
|
|
[TestCase("1.05.9", "1.05.10", "memory://second.NodeSet2.xml")]
|
|
[TestCase("1.05.10", "1.05.9", "memory://first.NodeSet2.xml")]
|
|
public void NewestVersionWinsRegardlessOfOrdinalOrdering(
|
|
string firstVersion,
|
|
string secondVersion,
|
|
string expectedWinner)
|
|
{
|
|
const string first = "memory://first.NodeSet2.xml";
|
|
const string second = "memory://second.NodeSet2.xml";
|
|
|
|
m_fileSystem.Add(first, Encoding.UTF8.GetBytes(NodeSet(firstVersion)));
|
|
m_fileSystem.Add(second, Encoding.UTF8.GetBytes(NodeSet(secondVersion)));
|
|
|
|
NodesetFileCollection collection = Create(
|
|
(first, firstVersion), (second, secondVersion));
|
|
|
|
Assert.That(collection.Files[ModelUri], Is.EqualTo(expectedWinner));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: a newer NodeSet read before an older one for the same
|
|
/// model URI was overwritten by the older one unconditionally.
|
|
/// </summary>
|
|
[Test]
|
|
public void NewestVersionWinsWhenItIsReadFirst()
|
|
{
|
|
const string newer = "memory://a-newer.NodeSet2.xml";
|
|
const string older = "memory://b-older.NodeSet2.xml";
|
|
|
|
m_fileSystem.Add(newer, Encoding.UTF8.GetBytes(NodeSet("2.0.0")));
|
|
m_fileSystem.Add(older, Encoding.UTF8.GetBytes(NodeSet("1.0.0")));
|
|
|
|
NodesetFileCollection collection = Create((newer, "2.0.0"), (older, "1.0.0"));
|
|
|
|
Assert.That(collection.Files[ModelUri], Is.EqualTo(newer));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: Files exposes one entry per model URI, so a superseded
|
|
/// version's path was not recognised as a NodeSet2 input and the
|
|
/// ModelDesign pass picked it up and generated the model a second time.
|
|
/// AllFilePaths reports every loaded file.
|
|
/// </summary>
|
|
[Test]
|
|
public void AllFilePathsIncludesSupersededVersions()
|
|
{
|
|
const string older = "memory://older.NodeSet2.xml";
|
|
const string newer = "memory://newer.NodeSet2.xml";
|
|
|
|
m_fileSystem.Add(older, Encoding.UTF8.GetBytes(NodeSet("1.0.0")));
|
|
m_fileSystem.Add(newer, Encoding.UTF8.GetBytes(NodeSet("2.0.0")));
|
|
|
|
NodesetFileCollection collection = Create((older, "1.0.0"), (newer, "2.0.0"));
|
|
|
|
Assert.That(collection.Files.Values, Is.EquivalentTo(new[] { newer }));
|
|
Assert.That(
|
|
collection.AllFilePaths,
|
|
Is.EquivalentTo(new[] { newer, older }),
|
|
"a superseded NodeSet is still a NodeSet input");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: the NodeSet's own <Model Version="..."> was never read -
|
|
/// Info.Version came from the item metadata or fell straight through to
|
|
/// the publication date. Two ordinary AdditionalFiles declaring 1.05.9
|
|
/// and 1.05.10 were therefore selected by publication date instead of by
|
|
/// version.
|
|
/// </summary>
|
|
[Test]
|
|
public void DeclaredModelVersionIsUsedWhenTheItemMetadataHasNone()
|
|
{
|
|
const string older = "memory://a-older.NodeSet2.xml";
|
|
const string newer = "memory://b-newer.NodeSet2.xml";
|
|
|
|
// The 1.05.9 file is published later, so a date comparison would
|
|
// pick it; the declared versions say otherwise.
|
|
m_fileSystem.Add(
|
|
older,
|
|
Encoding.UTF8.GetBytes(NodeSet("1.05.9", "2026-09-01T00:00:00Z")));
|
|
m_fileSystem.Add(
|
|
newer,
|
|
Encoding.UTF8.GetBytes(NodeSet("1.05.10", "2026-01-01T00:00:00Z")));
|
|
|
|
// No options.Version - the version has to come from <Models>.
|
|
NodesetFileCollection collection = Create((older, null), (newer, null));
|
|
|
|
Assert.That(
|
|
collection.Files[ModelUri],
|
|
Is.EqualTo(newer),
|
|
"1.05.10 is newer than 1.05.9 regardless of publication date");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Item metadata still wins over the NodeSet's own declaration.
|
|
/// </summary>
|
|
[Test]
|
|
public void ItemMetadataVersionOverridesTheDeclaredModelVersion()
|
|
{
|
|
const string first = "memory://first.NodeSet2.xml";
|
|
const string second = "memory://second.NodeSet2.xml";
|
|
|
|
m_fileSystem.Add(first, Encoding.UTF8.GetBytes(NodeSet("9.0.0")));
|
|
m_fileSystem.Add(second, Encoding.UTF8.GetBytes(NodeSet("1.0.0")));
|
|
|
|
// The metadata reverses what the files declare.
|
|
NodesetFileCollection collection = Create(
|
|
(first, "1.0.0"), (second, "9.0.0"));
|
|
|
|
Assert.That(collection.Files[ModelUri], Is.EqualTo(second));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regression: the ISO-date guard only fired when both sides were dates,
|
|
/// so a version-less NodeSet (whose version is its publication date) was
|
|
/// run through the version parser against a real version. "2021-04-15"
|
|
/// loses its month and day to the pre-release split and comes back as
|
|
/// major 2021, which outranks every real version - the stale NodeSet won.
|
|
/// </summary>
|
|
[Test]
|
|
public void ExplicitVersionIsNotBeatenByADateShapedVersion()
|
|
{
|
|
const string dated = "memory://a-dated.NodeSet2.xml";
|
|
const string versioned = "memory://b-versioned.NodeSet2.xml";
|
|
|
|
// The dated one is older by publication date, so it must lose.
|
|
m_fileSystem.Add(
|
|
dated,
|
|
Encoding.UTF8.GetBytes(NodeSet(null, "2021-04-15T00:00:00Z")));
|
|
m_fileSystem.Add(
|
|
versioned,
|
|
Encoding.UTF8.GetBytes(NodeSet("1.05.4", "2026-08-12T00:00:00Z")));
|
|
|
|
NodesetFileCollection collection = Create(
|
|
(dated, null), (versioned, "1.05.4"));
|
|
|
|
Assert.That(
|
|
collection.Files[ModelUri],
|
|
Is.EqualTo(versioned),
|
|
"a year parsed as a major version must not outrank a real version");
|
|
}
|
|
|
|
/// <summary>
|
|
/// A version-less NodeSet falls back to its publication date, which must
|
|
/// keep comparing as a date rather than going through the version parser.
|
|
/// </summary>
|
|
[Test]
|
|
public void PublicationDateIsUsedWhenNoVersionIsDeclared()
|
|
{
|
|
const string older = "memory://older.NodeSet2.xml";
|
|
const string newer = "memory://newer.NodeSet2.xml";
|
|
|
|
m_fileSystem.Add(
|
|
older, Encoding.UTF8.GetBytes(NodeSet(null, "2024-05-01T00:00:00Z")));
|
|
m_fileSystem.Add(
|
|
newer, Encoding.UTF8.GetBytes(NodeSet(null, "2024-12-01T00:00:00Z")));
|
|
|
|
NodesetFileCollection collection = Create((older, null), (newer, null));
|
|
|
|
Assert.That(collection.Files[ModelUri], Is.EqualTo(newer));
|
|
}
|
|
|
|
private NodesetFileCollection Create(params (string Path, string Version)[] inputs)
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
List<(string, NodesetFileOptions)> files =
|
|
[.. inputs.Select(i => (
|
|
i.Path,
|
|
new NodesetFileOptions { Version = i.Version }))];
|
|
return new NodesetFileCollection(
|
|
[.. files],
|
|
[],
|
|
m_fileSystem,
|
|
telemetry);
|
|
}
|
|
|
|
private static string NodeSet(
|
|
string version,
|
|
string publicationDate = "2026-08-12T00:00:00Z")
|
|
{
|
|
string versionAttribute = version == null
|
|
? string.Empty
|
|
: $" Version=\"{version}\"";
|
|
|
|
return $"""
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
|
xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
|
|
<NamespaceUris>
|
|
<Uri>{ModelUri}</Uri>
|
|
</NamespaceUris>
|
|
<Models>
|
|
<Model ModelUri="{ModelUri}"
|
|
PublicationDate="{publicationDate}"{versionAttribute} />
|
|
</Models>
|
|
<Aliases>
|
|
<Alias Alias="HasSubtype">i=45</Alias>
|
|
</Aliases>
|
|
<UAObjectType NodeId="ns=1;i=1000" BrowseName="1:SomeType">
|
|
<DisplayName>SomeType</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
|
|
</References>
|
|
</UAObjectType>
|
|
</UANodeSet>
|
|
""";
|
|
}
|
|
}
|
|
}
|