Files
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

389 lines
13 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2026 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.Globalization;
namespace Opc.Ua.SourceGeneration
{
/// <summary>
/// Lenient (major, minor, patch) version used for dependency resolution.
/// Parses OPC-UA-style strings such as <c>"1.05.07"</c>, <c>"1.5.7"</c>,
/// <c>"v105"</c>, <c>"1.5"</c> or <c>"1.5.7-rc1"</c>. Pre-release suffixes
/// are detected and cause the value to sort below the corresponding release.
/// </summary>
/// <remarks>
/// This is not a full SemVer 2.0 implementation. It is intentionally
/// permissive so that it can consume version strings from heterogeneous
/// OPC UA models without failing the build.
/// </remarks>
internal readonly struct SemVer : IEquatable<SemVer>, IComparable<SemVer>
{
/// <summary>
/// Sentinel representing "no version declared". Compares as less than
/// every parseable version; two missing versions compare equal.
/// </summary>
public static readonly SemVer Unspecified;
private static readonly char[] s_prereleaseSeparators = ['-', '+'];
private SemVer(int major, int minor, int patch, bool hasValue, bool isPrerelease)
{
Major = major;
Minor = minor;
Patch = patch;
HasValue = hasValue;
IsPrerelease = isPrerelease;
}
/// <summary>Major component (X in X.Y.Z).</summary>
public int Major { get; }
/// <summary>Minor component (Y in X.Y.Z).</summary>
public int Minor { get; }
/// <summary>Patch component (Z in X.Y.Z); zero when the source omits it.</summary>
public int Patch { get; }
/// <summary>True when the version was present and parseable.</summary>
public bool HasValue { get; }
/// <summary>True when the original string carried a pre-release tag (e.g. <c>-rc1</c>).</summary>
public bool IsPrerelease { get; }
/// <summary>
/// Tries to parse a version string. Returns <see cref="Unspecified"/> and
/// <c>false</c> when the input is null, empty, or unparseable.
/// </summary>
public static bool TryParse(string text, out SemVer value)
{
value = Unspecified;
if (string.IsNullOrWhiteSpace(text))
{
return false;
}
// Strip a leading "v"/"V" prefix.
string s = text.Trim();
if (s.Length > 0 && (s[0] == 'v' || s[0] == 'V'))
{
s = s[1..];
}
// Detach any pre-release tag after '-' or '+'.
bool isPrerelease = false;
int tagAt = s.IndexOfAny(s_prereleaseSeparators);
if (tagAt >= 0)
{
isPrerelease = true;
s = s[..tagAt];
}
if (s.Length == 0)
{
return false;
}
// Split on '.'; int.Parse ignores leading zeros.
string[] parts = s.Split('.');
// Compact "v105" form has no dots: treat as condensed digit form when
// the length makes decomposition unambiguous.
if (parts.Length == 1 && IsAllDigits(parts[0]))
{
return TryParseCondensedForm(parts[0], isPrerelease, out value);
}
int major = 0;
int minor = 0;
int patch = 0;
if (parts.Length > 0 && !TryParseComponent(parts[0], out major))
{
return false;
}
if (parts.Length > 1 && !TryParseComponent(parts[1], out minor))
{
return false;
}
if (parts.Length > 2 && !TryParseComponent(parts[2], out patch))
{
return false;
}
// parts.Length > 3 is tolerated; trailing components are ignored.
value = new SemVer(major, minor, patch, hasValue: true, isPrerelease: isPrerelease);
return true;
}
/// <summary>
/// Orders two model version strings. A model that declares no version
/// carries its publication date instead, and a date must not go through
/// <see cref="TryParse"/>: "2024-05-01" loses its month and day to the
/// pre-release split and comes back as major 2024, which outranks every
/// real version. Dates are therefore compared as dates, versions as
/// versions, and a date against a version is reported as equal - the two
/// are not comparable, and guessing would promote a stale model. Callers
/// break that tie on the publication date.
/// </summary>
public static int CompareVersionStrings(string left, string right)
{
bool leftIsDate = IsIsoDate(left);
bool rightIsDate = IsIsoDate(right);
if (leftIsDate || rightIsDate)
{
// ISO dates sort correctly as ordinal text.
return leftIsDate && rightIsDate ? string.CompareOrdinal(left, right) : 0;
}
bool leftParsed = TryParse(left, out SemVer leftVersion);
bool rightParsed = TryParse(right, out SemVer rightVersion);
if (leftParsed && rightParsed)
{
return leftVersion.CompareTo(rightVersion);
}
// Unspecified sorts below everything, which is not what an
// unparseable string means - fall back to the ordinal order.
return string.CompareOrdinal(left, right);
}
/// <summary>
/// True when the text is a bare ISO-8601 date, the form a model version
/// takes when it falls back to the publication date.
/// </summary>
public static bool IsIsoDate(string value)
{
return value != null &&
DateTime.TryParseExact(
value,
"yyyy-MM-dd",
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out _);
}
/// <summary>Parses or throws.</summary>
/// <exception cref="FormatException"></exception>
public static SemVer Parse(string text)
{
if (!TryParse(text, out SemVer v))
{
throw new FormatException("Unparseable version string: '" + text + "'");
}
return v;
}
/// <summary>True when the two values share a major component. Unspecified values never match.</summary>
public bool SameMajor(SemVer other)
{
return HasValue && other.HasValue && Major == other.Major;
}
/// <inheritdoc/>
public int CompareTo(SemVer other)
{
// Unspecified sorts below everything; two Unspecifieds are equal.
if (!HasValue)
{
return other.HasValue ? -1 : 0;
}
if (!other.HasValue)
{
return 1;
}
int c = Major.CompareTo(other.Major);
if (c != 0)
{
return c;
}
c = Minor.CompareTo(other.Minor);
if (c != 0)
{
return c;
}
c = Patch.CompareTo(other.Patch);
if (c != 0)
{
return c;
}
// Pre-release sorts below its release counterpart.
if (IsPrerelease == other.IsPrerelease)
{
return 0;
}
return IsPrerelease ? -1 : 1;
}
/// <inheritdoc/>
public bool Equals(SemVer other)
{
return HasValue == other.HasValue &&
Major == other.Major &&
Minor == other.Minor &&
Patch == other.Patch &&
IsPrerelease == other.IsPrerelease;
}
/// <inheritdoc/>
public override bool Equals(object obj)
{
return obj is SemVer v && Equals(v);
}
/// <inheritdoc/>
public override int GetHashCode()
{
if (!HasValue)
{
return 0;
}
unchecked
{
int hash = Major;
hash = (hash * 397) ^ Minor;
hash = (hash * 397) ^ Patch;
hash = (hash * 397) ^ (IsPrerelease ? 1 : 0);
return hash;
}
}
/// <inheritdoc/>
public override string ToString()
{
if (!HasValue)
{
return "<unspecified>";
}
string core = Major.ToString(CultureInfo.InvariantCulture) +
"." +
Minor.ToString(CultureInfo.InvariantCulture) +
"." +
Patch.ToString(CultureInfo.InvariantCulture);
return IsPrerelease ? core + "-pre" : core;
}
public static bool operator ==(SemVer left, SemVer right)
{
return left.Equals(right);
}
public static bool operator !=(SemVer left, SemVer right)
{
return !left.Equals(right);
}
public static bool operator <(SemVer left, SemVer right)
{
return left.CompareTo(right) < 0;
}
public static bool operator >(SemVer left, SemVer right)
{
return left.CompareTo(right) > 0;
}
public static bool operator <=(SemVer left, SemVer right)
{
return left.CompareTo(right) <= 0;
}
public static bool operator >=(SemVer left, SemVer right)
{
return left.CompareTo(right) >= 0;
}
private static bool TryParseSlice(string source, int start, int length, out int value)
{
#if NET || NETSTANDARD2_1_OR_GREATER
return int.TryParse(source.AsSpan(start, length), NumberStyles.Integer, CultureInfo.InvariantCulture, out value);
#else
return int.TryParse(source.Substring(start, length), NumberStyles.Integer, CultureInfo.InvariantCulture, out value);
#endif
}
private static bool TryParseComponent(string text, out int value)
{
if (int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out value) && value >= 0)
{
return true;
}
value = 0;
return false;
}
private static bool IsAllDigits(string s)
{
for (int i = 0; i < s.Length; i++)
{
if (!char.IsDigit(s[i]))
{
return false;
}
}
return true;
}
private static bool TryParseCondensedForm(string digits, bool isPrerelease, out SemVer value)
{
// "105" -> 1.05.0 -> (1, 5, 0). "10506" -> (1, 5, 6).
// Only 3-digit and 5-digit forms are decomposed; anything else is
// treated as a bare major integer.
if (digits.Length == 3)
{
int major = digits[0] - '0';
if (TryParseSlice(digits, 1, 2, out int minor))
{
value = new SemVer(major, minor, 0, hasValue: true, isPrerelease: isPrerelease);
return true;
}
}
else if (digits.Length == 5)
{
int major = digits[0] - '0';
if (TryParseSlice(digits, 1, 2, out int minor) &&
TryParseSlice(digits, 3, 2, out int patch))
{
value = new SemVer(major, minor, patch, hasValue: true, isPrerelease: isPrerelease);
return true;
}
}
if (int.TryParse(digits, NumberStyles.Integer, CultureInfo.InvariantCulture, out int maj))
{
value = new SemVer(maj, 0, 0, hasValue: true, isPrerelease: isPrerelease);
return true;
}
value = Unspecified;
return false;
}
}
}