mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-25 11:50:03 +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>
377 lines
13 KiB
C#
377 lines
13 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.Text;
|
|
using System.Xml;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Common utils for all generators
|
|
/// </summary>
|
|
internal static class SourceGenerationUtils
|
|
{
|
|
/// <summary>
|
|
/// Ensures the first character is lower case.
|
|
/// </summary>
|
|
public static string ToLowerCamelCase(this string name)
|
|
{
|
|
if (string.IsNullOrEmpty(name))
|
|
{
|
|
return name;
|
|
}
|
|
|
|
if (char.IsLower(name[0]))
|
|
{
|
|
return name;
|
|
}
|
|
|
|
return CoreUtils.Format("{0}{1}", char.ToLowerInvariant(name[0]), name[1..]);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Ensures the first character is upper case.
|
|
/// </summary>
|
|
public static string ToUpperCamelCase(this string name)
|
|
{
|
|
if (string.IsNullOrEmpty(name))
|
|
{
|
|
return name;
|
|
}
|
|
|
|
if (char.IsUpper(name[0]))
|
|
{
|
|
return name;
|
|
}
|
|
|
|
return CoreUtils.Format("{0}{1}", char.ToUpperInvariant(name[0]), name[1..]);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Converts an authored name to a valid C# identifier.
|
|
/// </summary>
|
|
public static string ToCSharpIdentifier(
|
|
this string name,
|
|
bool upperCamelCase = false)
|
|
{
|
|
return ToCSharpIdentifierCore(name, upperCamelCase);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Converts an authored name to a valid C# identifier but leaves the casing
|
|
/// of the name untouched. Used where the identifier is part of the public
|
|
/// surface of generated code and must keep the name the model author wrote.
|
|
/// </summary>
|
|
public static string ToCSharpIdentifierPreserveCase(this string name)
|
|
{
|
|
return ToCSharpIdentifierCore(name, null);
|
|
}
|
|
|
|
private static string ToCSharpIdentifierCore(string name, bool? upperCamelCase)
|
|
{
|
|
string source = name?.TrimStart('@');
|
|
if (string.IsNullOrEmpty(source))
|
|
{
|
|
return upperCamelCase == false ? "value" : "Value";
|
|
}
|
|
|
|
var buffer = new StringBuilder(source.Length);
|
|
bool applyCasing = true;
|
|
foreach (char character in source)
|
|
{
|
|
if (char.IsWhiteSpace(character))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
char identifierCharacter =
|
|
char.IsLetterOrDigit(character) || character == '_' ?
|
|
character :
|
|
'_';
|
|
if (buffer.Length == 0 && char.IsDigit(identifierCharacter))
|
|
{
|
|
buffer.Append('_');
|
|
}
|
|
if (applyCasing && upperCamelCase.HasValue && char.IsLetter(identifierCharacter))
|
|
{
|
|
identifierCharacter = upperCamelCase.Value ?
|
|
char.ToUpperInvariant(identifierCharacter) :
|
|
char.ToLowerInvariant(identifierCharacter);
|
|
applyCasing = false;
|
|
}
|
|
buffer.Append(identifierCharacter);
|
|
}
|
|
|
|
if (buffer.Length == 0)
|
|
{
|
|
return upperCamelCase == false ? "value" : "Value";
|
|
}
|
|
|
|
string identifier = buffer.ToString();
|
|
return s_csharpKeywords.Contains(identifier) ? "@" + identifier : identifier;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Convert string to a safe symbol for dotnet use
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public static string ToSafeSymbolName(
|
|
this string name,
|
|
bool toLowerCamelCase = false,
|
|
string prefix = null)
|
|
{
|
|
if (string.IsNullOrEmpty(name))
|
|
{
|
|
return name;
|
|
}
|
|
var buffer = new StringBuilder();
|
|
foreach (char c in name)
|
|
{
|
|
if (char.IsWhiteSpace(c))
|
|
{
|
|
continue;
|
|
}
|
|
if (toLowerCamelCase)
|
|
{
|
|
buffer.Append(char.ToLowerInvariant(c));
|
|
toLowerCamelCase = false;
|
|
continue;
|
|
}
|
|
buffer.Append(c);
|
|
}
|
|
string symbol = buffer.ToString();
|
|
if (!string.IsNullOrEmpty(prefix))
|
|
{
|
|
return prefix + symbol;
|
|
}
|
|
switch (symbol)
|
|
{
|
|
case "event":
|
|
case "params":
|
|
case "object":
|
|
case "class":
|
|
case "struct":
|
|
case "record":
|
|
case "void":
|
|
case "private":
|
|
case "protected":
|
|
case "public":
|
|
case "internal":
|
|
case "static":
|
|
case "readonly":
|
|
case "const":
|
|
case "null":
|
|
case "sealed":
|
|
case "override":
|
|
case "virtual":
|
|
case "interface":
|
|
case "enum":
|
|
case "namespace":
|
|
case "using":
|
|
case "new":
|
|
case "this":
|
|
case "base":
|
|
case "if":
|
|
case "else":
|
|
case "for":
|
|
case "foreach":
|
|
case "while":
|
|
case "do":
|
|
case "switch":
|
|
case "case":
|
|
case "default":
|
|
case "break":
|
|
case "continue":
|
|
case "return":
|
|
case "try":
|
|
case "catch":
|
|
case "finally":
|
|
case "throw":
|
|
case "in":
|
|
case "ref":
|
|
case "out":
|
|
case "set":
|
|
case "get":
|
|
case "value":
|
|
case "var":
|
|
case "dynamic":
|
|
case "async":
|
|
case "await":
|
|
case "string":
|
|
case "byte":
|
|
case "sbyte":
|
|
case "char":
|
|
case "bool":
|
|
case "short":
|
|
case "ushort":
|
|
case "uint":
|
|
case "ulong":
|
|
case "int":
|
|
case "long":
|
|
case "float":
|
|
case "double":
|
|
case "decimal":
|
|
return "@" + symbol;
|
|
}
|
|
return symbol;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wrap the string as a string literal for generated code.
|
|
/// </summary>
|
|
/// <param name="value"></param>
|
|
/// <returns></returns>
|
|
public static string AsStringLiteral(this string value)
|
|
{
|
|
if (string.IsNullOrEmpty(value))
|
|
{
|
|
return "string.Empty";
|
|
}
|
|
value = value
|
|
.Replace("\\", "\\\\", StringComparison.Ordinal)
|
|
.Replace("\"", "\\\"", StringComparison.Ordinal)
|
|
.Replace("\n", "\\n", StringComparison.Ordinal)
|
|
.Replace("\r", "\\r", StringComparison.Ordinal)
|
|
.Replace("\t", "\\t", StringComparison.Ordinal)
|
|
.Replace("\u0085", "\\u0085", StringComparison.Ordinal)
|
|
.Replace("\u2028", "\\u2028", StringComparison.Ordinal)
|
|
.Replace("\u2029", "\\u2029", StringComparison.Ordinal);
|
|
return $"\"{value}\"";
|
|
}
|
|
|
|
/// <summary>
|
|
/// Escapes a value so it can be written as XML character data. Used by the
|
|
/// schema generators, which write the BSD and XSD documents through plain
|
|
/// text templates rather than an <see cref="XmlWriter"/>.
|
|
/// </summary>
|
|
public static string AsXmlText(this string value)
|
|
{
|
|
if (string.IsNullOrEmpty(value))
|
|
{
|
|
return value ?? string.Empty;
|
|
}
|
|
return value
|
|
.Replace("&", "&", StringComparison.Ordinal)
|
|
.Replace("<", "<", StringComparison.Ordinal)
|
|
.Replace(">", ">", StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <summary>
|
|
/// True when the value can be used as an XML element or attribute name -
|
|
/// an NCName. Escaping cannot rescue a name that is not one: an element
|
|
/// name is not character data, so "Read&Write" has no legal spelling
|
|
/// at all, and both <c>xs:element/@name</c> in the generated XSD and the
|
|
/// element the XML encoder writes require this.
|
|
/// </summary>
|
|
public static bool IsValidXmlName(this string value)
|
|
{
|
|
if (string.IsNullOrEmpty(value))
|
|
{
|
|
return false;
|
|
}
|
|
try
|
|
{
|
|
return string.Equals(
|
|
XmlConvert.VerifyNCName(value), value, StringComparison.Ordinal);
|
|
}
|
|
catch (XmlException)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Escapes a value so it can be written as the content of a double quoted
|
|
/// XML attribute.
|
|
/// </summary>
|
|
public static string AsXmlAttributeValue(this string value)
|
|
{
|
|
if (string.IsNullOrEmpty(value))
|
|
{
|
|
return value ?? string.Empty;
|
|
}
|
|
return value
|
|
.AsXmlText()
|
|
.Replace("\"", """, StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Escape string
|
|
/// </summary>
|
|
/// <param name="value"></param>
|
|
/// <returns></returns>
|
|
internal static string Escape(this string value)
|
|
{
|
|
if (value == null)
|
|
{
|
|
return string.Empty;
|
|
}
|
|
return value
|
|
.Replace("\\", "\\\\", StringComparison.Ordinal)
|
|
.Replace("\"", "\\\"", StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks for a null qualified name.
|
|
/// </summary>
|
|
public static bool IsNull(this XmlQualifiedName qname)
|
|
{
|
|
if (qname == null)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
if (string.IsNullOrEmpty(qname.Name))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
private static readonly HashSet<string> s_csharpKeywords =
|
|
[
|
|
"abstract", "as", "base", "bool", "break", "byte", "case", "catch",
|
|
"char", "checked", "class", "const", "continue", "decimal", "default",
|
|
"delegate", "do", "double", "else", "enum", "event", "explicit",
|
|
"extern", "false", "finally", "fixed", "float", "for", "foreach",
|
|
"goto", "if", "implicit", "in", "int", "interface", "internal", "is",
|
|
"lock", "long", "namespace", "new", "null", "object", "operator",
|
|
"out", "override", "params", "private", "protected", "public",
|
|
"readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof",
|
|
"stackalloc", "static", "string", "struct", "switch", "this",
|
|
"throw", "true", "try", "typeof", "uint", "ulong", "unchecked",
|
|
"unsafe", "ushort", "using", "virtual", "void", "volatile", "while",
|
|
"__arglist", "__makeref", "__reftype", "__refvalue"
|
|
];
|
|
}
|
|
}
|