mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-24 19:13:02 +08:00
## Summary Combines the compiled companion-model support from #4062 with the NodeState emission fixes already in this PR. The model source generator can now consume compiled companion `NodeSet2` models more reliably, while generated factories consistently target base `NodeState` members even when a generated subclass shadows them. ## Changes ### Compiled companion NodeSets - Add `OpcUaStateTypeIndex` and wire it through `ModelSourceGenerator` / `ModelCompilation` so standard (`ns=0`) node-state and method-state class names are resolved from referenced `Opc.Ua.Core(.Types)` metadata. - Add the model-generation-scoped `StandardMethodStateFallback`, which degrades an unresolved standard typed `*MethodState` reference to `global::Opc.Ua.MethodState` only when the type is neither available in the compilation nor declared by the current generation pass. - Keep declaration names outside the reference-only fallback policy, propagate fallback state through the logical execution context, reuse the immutable availability index, and use named incremental-generator inputs instead of deep `Left` / `Right` chains. - Escape generated fluent-builder XML documentation where browse names can contain XML-sensitive characters. ### Safe NodeState factory emission - Declare one base-typed `global::Opc.Ua.NodeState nodeState = state;` local per generated factory. - Use `nodeState` for base-member reads and writes to `NodeId`, `SymbolicName`, `BrowseName`, `DisplayName`, `Description`, `WriteMask`, `UserWriteMask`, `AccessRestrictions`, `ReleaseStatus`, `Categories`, `Specification` and `IsPartOfTypeHierarchy`. - Base-qualify the optional-child `previousNodeId` read, NodeId comparison, and existing-child NodeId update. - `global::`-qualify emitted `NodeId` / `ExpandedNodeId` namespace prefixes to avoid namespace collisions. ### Supporting updates - Expose `Opc.Ua.Types` internals to `Opc.Ua.Core.Encoders.Tests`. - Update generator assertions and add focused fallback regression coverage. ## Why Compiled companion models can instantiate standard types whose curated Core implementation does not expose the conventionally named typed method-state class. The scoped fallback lets those models generate without weakening the Stack generator or masking classes emitted by the current model. Separately, generated subclasses can shadow base `NodeState` properties with strongly typed `new` properties. Routing base attributes through a `NodeState`-typed local guarantees initialization reaches the intended base member while keeping generated code smaller and clearer than repeated casts. ## Validation - Full `Opc.Ua.SourceGeneration.Core.Tests` on net10.0: **3718 passed / 8 skipped / 0 failed**. - Combined focused generator coverage on net48: **21 passed / 0 failed**. - Full `Opc.Ua.SourceGeneration.Tests`: **68 passed / 0 failed**. - Full `Opc.Ua.SourceGeneration.Stack.Tests`: **90 passed / 0 failed**. ## Context This PR supersedes #4062 and contains both source-generator change sets. The companion-model fallback remains the scoped interim workaround tracked by #4060; a future upstream name-resolution step can remove it. These changes also feed the experimental data-encodings work in #4007. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
168 lines
7.9 KiB
C#
168 lines
7.9 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 IIncrementalGenerator = SGF.IncrementalGenerator;
|
|
using IncrementalGeneratorAttribute = SGF.IncrementalGeneratorAttribute;
|
|
using IncrementalGeneratorInitializationContext = SGF.SgfInitializationContext;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Generates server and client models using the model generator library
|
|
/// </summary>
|
|
[IncrementalGenerator]
|
|
public class ModelSourceGenerator : IIncrementalGenerator
|
|
{
|
|
/// <inheritdoc/>
|
|
public ModelSourceGenerator()
|
|
: base(SourceGenerator.Name)
|
|
{
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override void OnInitialize(IncrementalGeneratorInitializationContext context)
|
|
{
|
|
#if DEBUGX
|
|
AttachDebugger();
|
|
#endif
|
|
IncrementalValueProvider<ImmutableArray<(AdditionalText Left, NodesetFileOptions)>> inputFiles =
|
|
context.AdditionalTextsProvider
|
|
.Where(f => f.IsDesignOrNodeset2File())
|
|
.Combine(context.AnalyzerConfigOptionsProvider)
|
|
.Select((pair, _) => (
|
|
pair.Left,
|
|
pair.Right.GetOptions(pair.Left).ToNodeSetOptions()))
|
|
.Collect();
|
|
IncrementalValueProvider<ImmutableArray<AdditionalText>> identifierFiles =
|
|
context.AdditionalTextsProvider
|
|
.Where(f => f.IsIdentifierFile())
|
|
.Collect();
|
|
IncrementalValueProvider<ModelCompilationOptions> options =
|
|
context.AnalyzerConfigOptionsProvider
|
|
.Select((p, _) => ModelCompilationOptions.From(p));
|
|
IncrementalValueProvider<CompilationOptions> settings =
|
|
context.CompilationProvider
|
|
.Select((c, _) => CompilationOptions.From(c));
|
|
IncrementalValueProvider<ImmutableArray<ModelDependencyReference>> referencedModels =
|
|
context.CompilationProvider
|
|
.Select((c, _) => ReferencedModelDependencyScanner.Scan(c));
|
|
IncrementalValueProvider<ImmutableHashSet<string>> stateTypeIndex =
|
|
context.CompilationProvider
|
|
.Select((c, _) => OpcUaStateTypeIndex.Build(c));
|
|
|
|
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();
|
|
|
|
var modelFiles = inputFiles
|
|
.Combine(identifierFiles)
|
|
.Select(static (pair, _) => (
|
|
InputFiles: pair.Left,
|
|
IdentifierFiles: pair.Right));
|
|
var modelSettings = options
|
|
.Combine(settings)
|
|
.Select(static (pair, _) => (
|
|
Options: pair.Left,
|
|
CompilationOptions: pair.Right));
|
|
var modelReferences = referencedModels
|
|
.Combine(nodeManagerBindings)
|
|
.Select(static (pair, _) => (
|
|
ReferencedModels: pair.Left,
|
|
NodeManagerBindings: pair.Right));
|
|
var modelDependencies = modelReferences
|
|
.Combine(stateTypeIndex)
|
|
.Select(static (pair, _) => (
|
|
ReferencedModels: pair.Left.ReferencedModels,
|
|
NodeManagerBindings: pair.Left.NodeManagerBindings,
|
|
AvailableStateTypeNames: pair.Right));
|
|
var configuredModel = modelFiles
|
|
.Combine(modelSettings)
|
|
.Select(static (pair, _) => (
|
|
InputFiles: pair.Left.InputFiles,
|
|
IdentifierFiles: pair.Left.IdentifierFiles,
|
|
Options: pair.Right.Options,
|
|
CompilationOptions: pair.Right.CompilationOptions));
|
|
IncrementalValueProvider<ModelCompilationInput> modelCompilationInput =
|
|
configuredModel
|
|
.Combine(modelDependencies)
|
|
.Select(static (pair, _) => new ModelCompilationInput(
|
|
pair.Left.InputFiles,
|
|
pair.Left.IdentifierFiles,
|
|
pair.Left.Options,
|
|
pair.Left.CompilationOptions,
|
|
pair.Right.ReferencedModels,
|
|
pair.Right.NodeManagerBindings,
|
|
pair.Right.AvailableStateTypeNames));
|
|
|
|
context.RegisterSourceOutput(
|
|
modelCompilationInput,
|
|
(context, input) => new ModelCompilation(
|
|
context,
|
|
input.InputFiles,
|
|
input.IdentifierFiles,
|
|
input.Options,
|
|
input.CompilationOptions,
|
|
input.ReferencedModels,
|
|
input.NodeManagerBindings,
|
|
input.AvailableStateTypeNames,
|
|
Logger).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) => DataTypeCompilation.EmitBatch(
|
|
spc, pair.Left, pair.Right));
|
|
}
|
|
|
|
private readonly record struct ModelCompilationInput(
|
|
ImmutableArray<(AdditionalText, NodesetFileOptions)> InputFiles,
|
|
ImmutableArray<AdditionalText> IdentifierFiles,
|
|
ModelCompilationOptions Options,
|
|
CompilationOptions CompilationOptions,
|
|
ImmutableArray<ModelDependencyReference> ReferencedModels,
|
|
ImmutableArray<NodeManagerAttributeDiscovery> NodeManagerBindings,
|
|
ImmutableHashSet<string> AvailableStateTypeNames);
|
|
}
|
|
}
|