mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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>
170 lines
7.1 KiB
C#
170 lines
7.1 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.Linq;
|
|
using System.Text;
|
|
using System.Threading;
|
|
using Microsoft.CodeAnalysis;
|
|
using Microsoft.CodeAnalysis.CSharp;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Generates the stack core
|
|
/// </summary>
|
|
internal sealed class StackGeneration
|
|
{
|
|
/// <summary>
|
|
/// Generate stack
|
|
/// </summary>
|
|
public StackGeneration(
|
|
SourceProductionContext context,
|
|
CompilationOptions compilationOptions,
|
|
StackGenerationOptions options)
|
|
{
|
|
m_context = context;
|
|
m_options = options;
|
|
m_compilationOptions = compilationOptions;
|
|
m_telemetry = SourceGeneratorTelemetry.Create(m_context);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Generate all stack files
|
|
/// </summary>
|
|
public void Emit(CancellationToken cancellationToken)
|
|
{
|
|
if (!CheckCompilationOptions(out StackGenerationType generationType))
|
|
{
|
|
return;
|
|
}
|
|
using var fileSystem = new VirtualFileSystem();
|
|
try
|
|
{
|
|
// Generate files into the virtual file system
|
|
Generators.GenerateStack(
|
|
generationType,
|
|
fileSystem,
|
|
string.Empty,
|
|
m_telemetry,
|
|
new GeneratorOptions
|
|
{
|
|
Cancellation = cancellationToken,
|
|
Exclusions = m_options.Exclude,
|
|
OptimizeForCompileSpeed =
|
|
m_compilationOptions.OptimizationLevel ==
|
|
OptimizationLevel.Debug,
|
|
// The standard NodeSet "Models" pass runs in the Opc.Ua
|
|
// (Types-only) assembly which does not reference
|
|
// ISessionClient/ObjectTypeClient. Proxies are emitted
|
|
// by the Stack pass (Opc.Ua.Core) instead.
|
|
OmitObjectTypeProxies =
|
|
generationType == StackGenerationType.Models,
|
|
// Neither pass references Opc.Ua.Server.Fluent. The
|
|
// typed-accessor extensions emitted by
|
|
// FluentBuilderGenerator delegate into the Server-side
|
|
// INodeBuilder<T> surface, so they must be omitted
|
|
// here. Server-side consumers that ship per-namespace
|
|
// accessors emit them from their own model packages
|
|
// (the default opt-out is honoured by setting
|
|
// ModelSourceGeneratorOmitFluentApi=true on the
|
|
// assembly's csproj when needed).
|
|
OmitFluentApi = true,
|
|
UseTypeDefinitionModellingRules = true
|
|
});
|
|
// Collect all generated cs files and produce them into the compilation
|
|
foreach (string file in fileSystem.CreatedFiles
|
|
.Where(f => f.EndsWith(".cs", StringComparison.OrdinalIgnoreCase)))
|
|
{
|
|
string content = Encoding.UTF8.GetString(fileSystem.Get(file));
|
|
m_context.AddSource(file, content);
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
m_context.ReportDiagnostic(
|
|
Diagnostic.Create(
|
|
SourceGenerator.Exception,
|
|
Location.None,
|
|
ex.Message,
|
|
ex.ToString()));
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Tests the compilation options are valid
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
private bool CheckCompilationOptions(out StackGenerationType type)
|
|
{
|
|
type = StackGenerationType.None;
|
|
|
|
// A generator must never fail a compilation it was not meant for.
|
|
// The stack generator is loaded into every compilation that
|
|
// references it transitively - a BenchmarkDotNet host project
|
|
// being the case that surfaced this - so an absent opt-in means
|
|
// "not my compilation", not "misconfigured".
|
|
if (string.IsNullOrEmpty(m_options.Mode))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (!m_compilationOptions.IsCSharp13OrLater)
|
|
{
|
|
m_context.ReportDiagnostic(
|
|
Diagnostic.Create(
|
|
SourceGenerator.GenericError,
|
|
Location.None,
|
|
"Opc UA stack is too old. Minimum required language version is CSharp 13."));
|
|
return false;
|
|
}
|
|
|
|
if (!Enum.TryParse(m_options.Mode, ignoreCase: true, out type) ||
|
|
type == StackGenerationType.None)
|
|
{
|
|
type = StackGenerationType.None;
|
|
m_context.ReportDiagnostic(
|
|
Diagnostic.Create(
|
|
SourceGenerator.GenericError,
|
|
Location.None,
|
|
$"'{m_options.Mode}' is not a valid {SourceGenerator.Name}Mode. " +
|
|
$"Use one of {StackGenerationType.Stack}, " +
|
|
$"{StackGenerationType.Models} or {StackGenerationType.All}."));
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private readonly SourceProductionContext m_context;
|
|
private readonly StackGenerationOptions m_options;
|
|
private readonly ITelemetryContext m_telemetry;
|
|
private readonly CompilationOptions m_compilationOptions;
|
|
}
|
|
}
|