mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 21:55:54 +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>
271 lines
14 KiB
C#
271 lines
14 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.Immutable;
|
|
using Microsoft.CodeAnalysis;
|
|
using Microsoft.CodeAnalysis.Diagnostics;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Generates server and client models using the model generator library
|
|
/// </summary>
|
|
[Generator(LanguageNames.CSharp)]
|
|
public sealed class ModelSourceGenerator : IIncrementalGenerator
|
|
{
|
|
/// <inheritdoc/>
|
|
public void Initialize(IncrementalGeneratorInitializationContext context)
|
|
{
|
|
SourceGenerator.AttachDebuggerIfRequested();
|
|
|
|
// Pair every AdditionalFile with its own per-file analyzer config
|
|
// options once, up front, so both the design/NodeSet2 filter and
|
|
// the WoT filter (which needs the per-file
|
|
// ModelSourceGeneratorWot opt-in metadata to recognize a plain
|
|
// .jsonld input) can be evaluated without recomputing options.
|
|
IncrementalValuesProvider<(AdditionalText Text, AnalyzerConfigOptions Options)> textsWithOptions =
|
|
context.AdditionalTextsProvider
|
|
.Combine(context.AnalyzerConfigOptionsProvider)
|
|
.Select(static (pair, _) => (pair.Left, pair.Right.GetOptions(pair.Left)));
|
|
|
|
IncrementalValueProvider<ImmutableArray<(AdditionalText Left, NodesetFileOptions)>> xmlInputFiles =
|
|
textsWithOptions
|
|
.Where(static pair => pair.Text.IsDesignOrNodeset2File())
|
|
.Select(static (pair, _) => (pair.Text, pair.Options.ToNodeSetOptions()))
|
|
.Collect();
|
|
|
|
// Snapshot the structural per-file options before conversion so
|
|
// downstream work remains cheaply cached per file. An ignored WoT
|
|
// input leaves the pipeline here, before its contents are read or
|
|
// it can produce diagnostics, dependencies or a virtual path claim.
|
|
IncrementalValuesProvider<(AdditionalText Text, NodesetFileOptions Options)> wotInputFiles =
|
|
textsWithOptions
|
|
.Where(static pair => pair.Text.IsWotFile(pair.Options))
|
|
.Select(static (pair, _) => (
|
|
pair.Text,
|
|
Options: pair.Options.ToNodeSetOptions()))
|
|
.Where(static pair => !pair.Options.Ignore);
|
|
|
|
// Every active WoT input is converted independently: parse, bounds,
|
|
// missing preservation/native mapping, dependency/resolver and
|
|
// conversion problems are captured as diagnostics on the outcome
|
|
// rather than thrown, so one malformed input can never abort the
|
|
// whole generator run.
|
|
IncrementalValueProvider<ImmutableArray<WotConversionOutcome>> wotOutcomes =
|
|
wotInputFiles
|
|
.Select(static (input, ct) => WotNodeSetAdditionalText.Convert(
|
|
input.Text, input.Options, ct))
|
|
.Collect();
|
|
|
|
// Resolve WoT outcomes against the explicit NodeSet2/ModelDesign
|
|
// inputs and each other: forwards every conversion diagnostic and
|
|
// drops (with a diagnostic) any WoT input whose synthesized
|
|
// virtual NodeSet2 path collides with another input, so a
|
|
// collision can never silently overwrite another model.
|
|
IncrementalValueProvider<(
|
|
ImmutableArray<(AdditionalText Text, NodesetFileOptions Options)> Accepted,
|
|
ImmutableArray<Diagnostic> Diagnostics)> resolvedWotInputs =
|
|
xmlInputFiles
|
|
.Combine(wotOutcomes)
|
|
.Select(static (pair, _) => pair.Left.ResolveWotInputs(pair.Right));
|
|
|
|
context.RegisterSourceOutput(resolvedWotInputs, static (spc, resolved) =>
|
|
{
|
|
foreach (Diagnostic diagnostic in resolved.Diagnostics)
|
|
{
|
|
spc.ReportDiagnostic(diagnostic);
|
|
}
|
|
});
|
|
|
|
IncrementalValueProvider<ImmutableArray<(AdditionalText Left, NodesetFileOptions)>> inputFiles =
|
|
xmlInputFiles
|
|
.Combine(resolvedWotInputs)
|
|
.Select(static (pair, _) => pair.Left.AddRange(pair.Right.Accepted));
|
|
IncrementalValueProvider<ImmutableArray<AdditionalText>> identifierFiles =
|
|
context.AdditionalTextsProvider
|
|
.Where(f => f.IsIdentifierFile())
|
|
.Collect();
|
|
IncrementalValueProvider<ImmutableArray<AdditionalText>> csvFiles =
|
|
context.AdditionalTextsProvider
|
|
.Where(f => f.HasFileExtension("csv"))
|
|
.Collect();
|
|
IncrementalValueProvider<ModelCompilationOptions> options =
|
|
context.AnalyzerConfigOptionsProvider
|
|
.Select((p, _) => ModelCompilationOptions.From(p));
|
|
IncrementalValueProvider<CompilationOptions> settings =
|
|
context.CompilationProvider
|
|
.Select((c, _) => CompilationOptions.From(c));
|
|
// Value comparers, not the reference equality ImmutableArray and
|
|
// ImmutableHashSet default to: these stages are derived from the
|
|
// compilation, so without them every keystroke invalidates the whole
|
|
// model generation even though nothing they read has changed.
|
|
IncrementalValueProvider<ImmutableArray<ModelDependencyReference>> referencedModels =
|
|
context.CompilationProvider
|
|
.Select((c, _) => ReferencedModelDependencyScanner.Scan(c))
|
|
.WithComparer(
|
|
IncrementalValueComparers.ForArray<ModelDependencyReference>());
|
|
IncrementalValueProvider<ImmutableArray<ModelFluentAccessorProviderReference>>
|
|
referencedAccessorProviders = context.CompilationProvider
|
|
.Select((c, _) => ReferencedFluentAccessorProviderScanner.Scan(c))
|
|
.WithComparer(
|
|
IncrementalValueComparers
|
|
.ForArray<ModelFluentAccessorProviderReference>());
|
|
IncrementalValueProvider<ImmutableHashSet<string>> stateTypeIndex =
|
|
context.CompilationProvider
|
|
.Select((c, _) => OpcUaStateTypeIndex.Build(c))
|
|
.WithComparer(IncrementalValueComparers.ForSet<string>());
|
|
|
|
IncrementalValueProvider<ImmutableArray<NodeManagerAttributeDiscovery>> nodeManagerBindings =
|
|
context.SyntaxProvider.ForAttributeWithMetadataName(
|
|
"Opc.Ua.Server.Fluent.NodeManagerAttribute",
|
|
static (node, ct) => NodeManagerAttributeDiscovery.Handles(node, ct),
|
|
static (ctx, ct) => NodeManagerAttributeDiscovery.Create(ctx, ct))
|
|
.Where(static m => m is not null)
|
|
.Collect();
|
|
|
|
IncrementalValueProvider<
|
|
(
|
|
ImmutableArray<(AdditionalText Left, NodesetFileOptions)> InputFiles,
|
|
ImmutableArray<AdditionalText> CsvFiles,
|
|
ImmutableArray<AdditionalText> IdentifierFiles)> modelFiles = inputFiles
|
|
.Combine(csvFiles)
|
|
.Combine(identifierFiles)
|
|
.Select(static (pair, _) => (
|
|
InputFiles: pair.Left.Left,
|
|
CsvFiles: pair.Left.Right,
|
|
IdentifierFiles: pair.Right));
|
|
IncrementalValueProvider<
|
|
(ModelCompilationOptions Options, CompilationOptions CompilationOptions)>
|
|
modelSettings = options
|
|
.Combine(settings)
|
|
.Select(static (pair, _) => (
|
|
Options: pair.Left,
|
|
CompilationOptions: pair.Right));
|
|
IncrementalValueProvider<
|
|
(
|
|
ImmutableArray<ModelDependencyReference> ReferencedModels,
|
|
ImmutableArray<ModelFluentAccessorProviderReference> ReferencedAccessorProviders,
|
|
ImmutableArray<NodeManagerAttributeDiscovery> NodeManagerBindings)>
|
|
modelReferences = referencedModels
|
|
.Combine(referencedAccessorProviders)
|
|
.Select(static (pair, _) => (
|
|
ReferencedModels: pair.Left,
|
|
ReferencedAccessorProviders: pair.Right))
|
|
.Combine(nodeManagerBindings)
|
|
.Select(static (pair, _) => (
|
|
ReferencedModels: pair.Left.ReferencedModels,
|
|
ReferencedAccessorProviders: pair.Left.ReferencedAccessorProviders,
|
|
NodeManagerBindings: pair.Right));
|
|
IncrementalValueProvider<
|
|
(
|
|
ImmutableArray<ModelDependencyReference> ReferencedModels,
|
|
ImmutableArray<ModelFluentAccessorProviderReference> ReferencedAccessorProviders,
|
|
ImmutableArray<NodeManagerAttributeDiscovery> NodeManagerBindings,
|
|
ImmutableHashSet<string> AvailableStateTypeNames)> modelDependencies =
|
|
modelReferences
|
|
.Combine(stateTypeIndex)
|
|
.Select(static (pair, _) => (
|
|
ReferencedModels: pair.Left.ReferencedModels,
|
|
ReferencedAccessorProviders: pair.Left.ReferencedAccessorProviders,
|
|
NodeManagerBindings: pair.Left.NodeManagerBindings,
|
|
AvailableStateTypeNames: pair.Right));
|
|
IncrementalValueProvider<
|
|
(
|
|
ImmutableArray<(AdditionalText Left, NodesetFileOptions)> InputFiles,
|
|
ImmutableArray<AdditionalText> CsvFiles,
|
|
ImmutableArray<AdditionalText> IdentifierFiles,
|
|
ModelCompilationOptions Options,
|
|
CompilationOptions CompilationOptions)> configuredModel = modelFiles
|
|
.Combine(modelSettings)
|
|
.Select(static (pair, _) => (pair.Left.InputFiles,
|
|
pair.Left.CsvFiles,
|
|
pair.Left.IdentifierFiles,
|
|
pair.Right.Options,
|
|
pair.Right.CompilationOptions));
|
|
IncrementalValueProvider<ModelCompilationInput> modelCompilationInput =
|
|
configuredModel
|
|
.Combine(modelDependencies)
|
|
.Select(static (pair, _) => new ModelCompilationInput(
|
|
pair.Left.InputFiles,
|
|
pair.Left.CsvFiles,
|
|
pair.Left.IdentifierFiles,
|
|
pair.Left.Options,
|
|
pair.Left.CompilationOptions,
|
|
pair.Right.ReferencedModels,
|
|
pair.Right.ReferencedAccessorProviders,
|
|
pair.Right.NodeManagerBindings,
|
|
pair.Right.AvailableStateTypeNames));
|
|
|
|
context.RegisterSourceOutput(
|
|
modelCompilationInput,
|
|
static (context, input) => SourceGenerator.Guard(
|
|
context,
|
|
() => new ModelCompilation(
|
|
context,
|
|
input.InputFiles,
|
|
input.CsvFiles,
|
|
input.IdentifierFiles,
|
|
input.Options,
|
|
input.CompilationOptions,
|
|
input.ReferencedModels,
|
|
input.ReferencedAccessorProviders,
|
|
input.NodeManagerBindings,
|
|
input.AvailableStateTypeNames).Emit(context.CancellationToken)));
|
|
|
|
IncrementalValueProvider<bool> publicDataTypeExtensions =
|
|
context.AnalyzerConfigOptionsProvider
|
|
.Select((p, _) => p.GlobalOptions.GetBool(
|
|
"PublicDataTypeExtensions"));
|
|
|
|
context.RegisterSourceOutput(context.SyntaxProvider.ForAttributeWithMetadataName(
|
|
"Opc.Ua.DataTypeAttribute",
|
|
static (node, ct) => DataTypeCompilation.Handles(node, ct),
|
|
static (context, ct) => new DataTypeCompilation(context, ct))
|
|
.Where(static m => m is not null)
|
|
.Collect()
|
|
.Combine(publicDataTypeExtensions),
|
|
static (spc, pair) => SourceGenerator.Guard(
|
|
spc,
|
|
() => DataTypeCompilation.EmitBatch(
|
|
spc, pair.Left, pair.Right)));
|
|
}
|
|
|
|
private readonly record struct ModelCompilationInput(
|
|
ImmutableArray<(AdditionalText, NodesetFileOptions)> InputFiles,
|
|
ImmutableArray<AdditionalText> CsvFiles,
|
|
ImmutableArray<AdditionalText> IdentifierFiles,
|
|
ModelCompilationOptions Options,
|
|
CompilationOptions CompilationOptions,
|
|
ImmutableArray<ModelDependencyReference> ReferencedModels,
|
|
ImmutableArray<ModelFluentAccessorProviderReference> ReferencedAccessorProviders,
|
|
ImmutableArray<NodeManagerAttributeDiscovery> NodeManagerBindings,
|
|
ImmutableHashSet<string> AvailableStateTypeNames);
|
|
}
|
|
}
|