Files
romanett e639932b95 Fix source generator defects from the Client/Types/SourceGeneration audit (#4473)
# 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>
2026-09-13 19:07:55 +02:00

516 lines
20 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.Collections.Immutable;
using System.Globalization;
using System.IO;
using System.Linq;
using Microsoft.Extensions.Logging;
using Opc.Ua.Export;
using Opc.Ua.Schema.Model;
using Opc.Ua.Types;
namespace Opc.Ua.SourceGeneration
{
/// <summary>
/// An entry in the collection
/// </summary>
public sealed class NodesetFile
{
/// <summary>
/// Nodeset information
/// </summary>
public NodesetFileOptions Info { get; init; }
/// <summary>
/// File name
/// </summary>
public string FileName { get; init; }
/// <summary>
/// The nodeset parsed
/// </summary>
public UANodeSet NodeSet { get; init; }
/// <summary>
/// Previous versions
/// </summary>
internal List<NodesetFile> PreviousVersions { get; set; }
}
/// <summary>
/// Nodeset information
/// </summary>
public sealed record class NodesetFileOptions
{
/// <summary>
/// Model uri
/// </summary>
public string ModelUri { get; init; }
/// <summary>
/// Name
/// </summary>
public string Name { get; init; }
/// <summary>
/// Prefix to use
/// </summary>
public string Prefix { get; init; }
/// <summary>
/// Should be ignored
/// </summary>
public bool Ignore { get; init; }
/// <summary>
/// Version
/// </summary>
public string Version { get; init; }
/// <summary>
/// Optional identifier CSV explicitly associated with this NodeSet.
/// </summary>
public string IdentifierFile { get; init; }
}
/// <summary>
/// Nodeset compiler
/// </summary>
public sealed class NodesetFileCollection
{
/// <summary>
/// The files in the collection
/// </summary>
public Dictionary<string, string> Files => m_nodesets
.ToDictionary(x => x.Key, x => x.Value.FileName);
/// <summary>
/// The path of every file identified as a NodeSet2 input, including the
/// superseded versions <see cref="Files"/> hides behind the winning one
/// and the ones that failed to load. Callers use this to tell NodeSet2
/// inputs apart from ModelDesign inputs: a superseded NodeSet is still a
/// NodeSet and must not be generated a second time by the ModelDesign
/// pass, and a NodeSet that failed to load is still not a ModelDesign -
/// handing it to the ModelDesign pass only turns a skipped file into a
/// second, more confusing failure.
/// </summary>
public IEnumerable<string> AllFilePaths => m_nodesetPaths;
/// <summary>
/// The models in the collection
/// </summary>
public IEnumerable<string> ModelUris => m_nodesets.Values
.Where(x => !x.Info.Ignore)
.Select(x => x.Info.ModelUri)
.Where(x => !string.IsNullOrEmpty(x));
/// <summary>
/// The design file entries for every nodeset in the collection,
/// encoded as <c>"{file},{prefix},{name}"</c> (the same encoding
/// used by <see cref="GetDesignFileListForModel"/>). These are
/// suitable for use as <c>Dependencies</c> of a ModelDesign
/// generation pass so that a ModelDesign referencing a type
/// defined in a NodeSet2 input can resolve it. The built-in OpcUa
/// namespace and ignored nodesets are excluded.
/// </summary>
public IEnumerable<string> DesignFileEntries => m_nodesets.Values
.Where(x => !x.Info.Ignore && x.Info.ModelUri != Namespaces.OpcUa)
.Select(x => $"{x.FileName},{x.Info.Prefix},{x.Info.Name}");
/// <summary>
/// Identifier sidecar validation errors discovered while loading NodeSets.
/// </summary>
public IReadOnlyList<NodesetIdentifierValidationError> IdentifierValidationErrors
=> m_identifierValidationErrors;
/// <summary>
/// Create collection
/// </summary>
public NodesetFileCollection(
ImmutableArray<(string, NodesetFileOptions)> nodeset2Files,
IReadOnlyList<string> csvFiles,
IFileSystem fileSystem,
ITelemetryContext telemetry)
{
m_logger = telemetry.CreateLogger<NodesetFileCollection>();
foreach ((string file, NodesetFileOptions options) in nodeset2Files)
{
try
{
if (!NodeSetToModelDesign.IsNodeSet(fileSystem, file))
{
continue;
}
// Positively identified as a NodeSet2 input. Record it
// before the load is attempted: a file that fails to load
// is still not a ModelDesign, and letting it fall through
// to the ModelDesign pass turns a skipped file into a
// second failure that aborts the whole pass.
m_nodesetPaths.Add(file);
using Stream istrm = fileSystem.OpenRead(file);
SystemContext systemContext = new(telemetry)
{
NamespaceUris = new NamespaceTable(),
ServerUris = new StringTable()
};
var nodeset = UANodeSet.Read(istrm);
#if !SKIP_NODE_STATE_LOADING
var collection = new NodeStateCollection();
try
{
nodeset.Import(systemContext, collection);
}
catch (Exception e)
{
m_logger.LogError(e, "NodeSet could not be loaded ({File})", file);
// Skip this NodeSet, not every remaining one - the other
// inputs are independent and must still be loaded.
continue;
}
#endif
if (nodeset.Models == null ||
nodeset.Models.Length == 0 ||
string.IsNullOrEmpty(nodeset.Models[0].ModelUri))
{
m_logger.LogError("NodeSet is missing model definition ({File}).", file);
continue;
}
ModelTableEntry model = nodeset.Models[0];
if (!Uri.IsWellFormedUriString(model.ModelUri, UriKind.Absolute))
{
m_logger.LogError(
"NodeSet ModelURI is not valid ({ModelUri}).", model.ModelUri);
continue;
}
string name = GetNameFromUri(model.ModelUri); // Get a sane name and prefix
var info = new NodesetFile
{
FileName = file,
NodeSet = nodeset,
Info = new NodesetFileOptions // Set reasonable defaults if not provided
{
ModelUri = !string.IsNullOrEmpty(options.ModelUri) ?
options.ModelUri : model.ModelUri,
// The NodeSet's own <Model Version="..."> before the
// publication date: a file that declares a version
// was being compared by date, so "1.05.9" and
// "1.05.10" were ordered by when they were published
// rather than by which version is newer.
Version = FirstNonEmpty(
options.Version,
model.Version,
model.PublicationDate.ToString(
"yyyy-MM-dd", CultureInfo.InvariantCulture)),
Name = !string.IsNullOrEmpty(options.Name) ?
options.Name : name,
Prefix = !string.IsNullOrEmpty(options.Prefix) ?
options.Prefix : name,
Ignore = options.Ignore,
IdentifierFile = options.IdentifierFile
}
};
if (!string.IsNullOrWhiteSpace(options.IdentifierFile))
{
string identifierFile = NodesetIdentifierFileValidator.ResolvePath(
file,
options.IdentifierFile,
csvFiles);
if (identifierFile == null)
{
m_identifierValidationErrors.Add(
NodesetIdentifierValidationError.MissingFile(
file,
options.IdentifierFile));
}
else
{
m_identifierFiles.Add((info, identifierFile));
}
}
if (m_nodesets.TryGetValue(model.ModelUri, out NodesetFile existing))
{
// Keep the newest version under the model URI and record
// the superseded one. Replacing unconditionally used to
// drop a newer NodeSet that happened to be read first.
if (CompareVersions(existing, info) < 0)
{
info.PreviousVersions = [];
if (existing.PreviousVersions != null)
{
info.PreviousVersions.AddRange(existing.PreviousVersions);
}
existing.PreviousVersions = null;
info.PreviousVersions.Add(existing);
m_nodesets[model.ModelUri] = info;
}
else
{
existing.PreviousVersions ??= [];
existing.PreviousVersions.Add(info);
}
continue;
}
m_nodesets[model.ModelUri] = info;
}
catch (Exception ex)
{
if (m_logger.IsEnabled(LogLevel.Critical))
{
m_logger.LogCritical(ex, "Could not parse NodeSet ({File}).", file);
}
}
}
foreach (IGrouping<string, (NodesetFile NodeSet, string IdentifierFile)> group in
m_identifierFiles
.GroupBy(entry => entry.IdentifierFile, StringComparer.Ordinal)
.OrderBy(entry => entry.Key, StringComparer.Ordinal))
{
if (group.Count() > 1)
{
foreach ((NodesetFile nodeset, string identifierFile) in group
.OrderBy(entry => entry.NodeSet.FileName, StringComparer.Ordinal))
{
m_identifierValidationErrors.Add(
NodesetIdentifierValidationError.AssignedToMultipleModels(
nodeset.FileName,
identifierFile));
}
continue;
}
(NodesetFile singleNodeset, string singleIdentifierFile) = group.Single();
m_identifierValidationErrors.AddRange(
NodesetIdentifierFileValidator.Validate(
fileSystem,
singleNodeset.FileName,
singleNodeset.Info.ModelUri,
singleIdentifierFile,
telemetry));
}
}
/// <summary>
/// Get nodeset and dependencies for the model uri
/// </summary>
/// <returns></returns>
public List<string> GetDesignFileListForModel(
string modelUri,
out NodesetFile nodeset,
IReadOnlyDictionary<string, ModelDependencyReference> referencedModels = null)
{
if (!m_nodesets.TryGetValue(modelUri, out nodeset))
{
return null;
}
Dictionary<string, NodesetFile> dependencies = [];
if (!CollectDependencies(nodeset, dependencies, referencedModels))
{
return null;
}
List<string> files = [$"{nodeset.FileName},{nodeset.Info.Prefix},{nodeset.Info.Name}"];
foreach (NodesetFile dependency in dependencies.Values
.Where(x => x.Info.ModelUri != Namespaces.OpcUa))
{
files.Add($"{dependency.FileName},{dependency.Info.Prefix},{dependency.Info.Name}");
}
return files;
}
/// <summary>
/// Collect dependencies
/// </summary>
private bool CollectDependencies(
NodesetFile target,
Dictionary<string, NodesetFile> dependencies,
IReadOnlyDictionary<string, ModelDependencyReference> referencedModels)
{
if (target.NodeSet.NamespaceUris == null)
{
return true;
}
foreach (string ns in target.NodeSet.NamespaceUris)
{
if (dependencies.ContainsKey(ns) || ns == target.Info.ModelUri)
{
continue;
}
if (!m_nodesets.TryGetValue(ns, out NodesetFile nodeset))
{
if (referencedModels != null && referencedModels.ContainsKey(ns))
{
// Dependency is supplied by a referenced assembly's
// generated code; not present in AdditionalFiles is
// expected. Skip without erroring.
if (m_logger.IsEnabled(LogLevel.Information))
{
m_logger.LogInformation(
"NodeSet ({ModelUri}) dependency ({Namespace}) " +
"satisfied by referenced assembly.",
target.Info.ModelUri,
ns);
}
continue;
}
m_logger.LogError(
"NodeSet ({ModelUri}) dependency is missing ({Namespace}).",
target.Info.ModelUri,
ns);
return false;
}
// favour the version in the same directory as the target.
if (nodeset.PreviousVersions != null &&
Path.GetDirectoryName(nodeset.FileName) !=
Path.GetDirectoryName(target.FileName))
{
foreach (NodesetFile ii in nodeset.PreviousVersions)
{
if (Path.GetDirectoryName(ii.FileName) ==
Path.GetDirectoryName(target.FileName))
{
nodeset = ii;
break;
}
}
}
dependencies[ns] = nodeset;
if (!CollectDependencies(nodeset, dependencies, referencedModels))
{
return false;
}
}
return true;
}
/// <summary>
/// Compares two NodeSets of the same model URI. Versions first (numeric
/// per component, because ordinally "1.05.9" sorts above "1.05.10"),
/// then the publication date - which also settles the case where one
/// side is versioned and the other only dated, and the version strings
/// are therefore not comparable at all.
/// </summary>
private static int CompareVersions(NodesetFile left, NodesetFile right)
{
int cmp = SemVer.CompareVersionStrings(left.Info.Version, right.Info.Version);
if (cmp != 0)
{
return cmp;
}
return DateTime.Compare(
GetPublicationDate(left), GetPublicationDate(right));
}
/// <summary>
/// The first of the candidates that carries a value.
/// </summary>
private static string FirstNonEmpty(params string[] candidates)
{
foreach (string candidate in candidates)
{
if (!string.IsNullOrEmpty(candidate))
{
return candidate;
}
}
return string.Empty;
}
private static DateTime GetPublicationDate(NodesetFile nodeset)
{
ModelTableEntry[] models = nodeset.NodeSet?.Models;
return models != null && models.Length > 0
? models[0].PublicationDate
: DateTime.MinValue;
}
private static string GetNameFromUri(string uri)
{
var builder = new Uri(uri);
string path = builder.LocalPath.TrimEnd('/');
if (path.StartsWith("/UA/", StringComparison.OrdinalIgnoreCase))
{
path = path[4..];
}
if (path.StartsWith("/OpcUa/", StringComparison.OrdinalIgnoreCase))
{
path = path[7..];
}
path = path.Trim('/')
.Replace("/", string.Empty, StringComparison.Ordinal)
.Replace('-', '_')
.Replace('+', '_');
int colon = path.LastIndexOf(':');
if (colon != -1)
{
path = path[(colon + 1)..];
}
// Remove invalid path characters
foreach (char c in Path.GetInvalidFileNameChars())
{
path = path.Replace(c, '_');
}
return path;
}
private readonly ILogger m_logger;
private readonly Dictionary<string, NodesetFile> m_nodesets = [];
/// <summary>
/// Every input recognised as a NodeSet2 file, whether or not it loaded
/// and whether or not it won its model URI. See <see cref="AllFilePaths"/>.
/// </summary>
private readonly HashSet<string> m_nodesetPaths = new(StringComparer.Ordinal);
private readonly List<(NodesetFile NodeSet, string IdentifierFile)> m_identifierFiles = [];
private readonly List<NodesetIdentifierValidationError> m_identifierValidationErrors = [];
}
}