mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 21:55:54 +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>
208 lines
8.5 KiB
C#
208 lines
8.5 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/
|
|
* ======================================================================*/
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Template strings
|
|
/// </summary>
|
|
internal static class NodeIdTemplates
|
|
{
|
|
/// <summary>
|
|
/// Identifiers file template
|
|
/// </summary>
|
|
public static readonly TemplateString File = TemplateString.Parse(
|
|
$$"""
|
|
{{Tokens.CodeHeader}}
|
|
|
|
namespace {{Tokens.Namespace}}
|
|
{
|
|
{{Tokens.ListOfIdentifiers}}
|
|
|
|
{{Tokens.ListOfNodeIds}}
|
|
}
|
|
""");
|
|
|
|
/// <summary>
|
|
/// Identifiers per node class
|
|
/// </summary>
|
|
public static readonly TemplateString IdsPerNodeClass = TemplateString.Parse(
|
|
$$"""
|
|
/// <summary>
|
|
/// A class that declares constants for all {{Tokens.NodeClass}}
|
|
/// symbolic names in the {{Tokens.Namespace}} namespace.
|
|
/// </summary>
|
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("{{Tokens.Tool}}", "{{Tokens.Version}}")]
|
|
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
|
|
public static partial class {{Tokens.NodeClass}}s
|
|
{
|
|
{{Tokens.ListOfIdentifiers}}
|
|
|
|
{{Tokens.IdentifierReflection}}
|
|
}
|
|
|
|
""");
|
|
|
|
/// <summary>
|
|
/// NodeIds per node class
|
|
/// </summary>
|
|
public static readonly TemplateString NodeIdPerNodeClass = TemplateString.Parse(
|
|
$$"""
|
|
/// <summary>
|
|
/// A class that declares constants for all {{Tokens.NodeClass}}
|
|
/// NodeIds in the {{Tokens.Namespace}} namespace.
|
|
/// </summary>
|
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("{{Tokens.Tool}}", "{{Tokens.Version}}")]
|
|
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
|
|
public static partial class {{Tokens.NodeClass}}Ids
|
|
{
|
|
{{Tokens.ListOfIdentifiers}}
|
|
|
|
{{Tokens.IdentifierReflection}}
|
|
}
|
|
|
|
""");
|
|
|
|
/// <summary>
|
|
/// Identifier declaration
|
|
/// </summary>
|
|
public static readonly TemplateString IdDeclaration = TemplateString.Parse(
|
|
$$"""
|
|
public const {{Tokens.IdType}} {{Tokens.SymbolicName}} = {{Tokens.Identifier}};
|
|
|
|
""");
|
|
|
|
/// <summary>
|
|
/// NodeId declaration with namespace URI
|
|
/// </summary>
|
|
public static readonly TemplateString NodeIdDeclarationAbsolute = TemplateString.Parse(
|
|
$$"""
|
|
public static readonly global::Opc.Ua.ExpandedNodeId {{Tokens.SymbolicName}} =
|
|
new global::Opc.Ua.ExpandedNodeId(global::{{Tokens.NamespacePrefix}}.{{Tokens.NodeClass}}s.{{Tokens.SymbolicName}}, {{Tokens.NamespaceUri}});
|
|
|
|
""");
|
|
|
|
/// <summary>
|
|
/// NodeId declaration
|
|
/// </summary>
|
|
public static readonly TemplateString NodeIdDeclaration = TemplateString.Parse(
|
|
$$"""
|
|
public static global::Opc.Ua.NodeId {{Tokens.SymbolicName}} =>
|
|
new global::Opc.Ua.NodeId(global::{{Tokens.NamespacePrefix}}.{{Tokens.NodeClass}}s.{{Tokens.SymbolicName}});
|
|
|
|
""");
|
|
|
|
/// <summary>
|
|
/// Reflection methods for identifiers
|
|
/// </summary>
|
|
public static readonly TemplateString Reflection = TemplateString.Parse(
|
|
$$"""
|
|
/// <summary>
|
|
/// Returns the browse names for all {{Tokens.ClassName}}
|
|
/// </summary>
|
|
public static global::System.Collections.Generic.IEnumerable<string> BrowseNames
|
|
=> s_nameToId.Value.Keys;
|
|
|
|
/// <summary>
|
|
/// Returns the ids for all {{Tokens.ClassName}}.
|
|
/// </summary>
|
|
public static global::System.Collections.Generic.IEnumerable<{{Tokens.IdType}}> Identifiers
|
|
=> s_idToName.Value.Keys;
|
|
|
|
/// <summary>
|
|
/// Returns the browse name for a {{Tokens.ClassName}} id.
|
|
/// </summary>
|
|
public static string GetBrowseName({{Tokens.IdType}} identifier)
|
|
{
|
|
return s_idToName.Value.TryGetValue(identifier, out string name) ? name : string.Empty;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the id for a {{Tokens.ClassName}} string.
|
|
/// </summary>
|
|
public static {{Tokens.IdType}} GetIdentifier(string browseName)
|
|
{
|
|
return s_nameToId.Value.TryGetValue(browseName, out {{Tokens.IdType}} id) ? id : default;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the browse name for a {{Tokens.ClassName}} id.
|
|
/// </summary>
|
|
public static bool TryGetBrowseName(
|
|
{{Tokens.IdType}} identifier,
|
|
/*[global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]*/ out string? name)
|
|
{
|
|
return s_idToName.Value.TryGetValue(identifier, out name);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the id for a {{Tokens.ClassName}} string.
|
|
/// </summary>
|
|
public static bool TryGetValue(string browseName, out {{Tokens.IdType}} id)
|
|
{
|
|
return s_nameToId.Value.TryGetValue(browseName, out id);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Lazy id to name lookup.
|
|
/// </summary>
|
|
private static readonly global::System.Lazy<
|
|
global::System.Collections.Generic.IReadOnlyDictionary<{{Tokens.IdType}}, string>> s_idToName =
|
|
new global::System.Lazy<
|
|
global::System.Collections.Generic.IReadOnlyDictionary<{{Tokens.IdType}}, string>>(() =>
|
|
{
|
|
var lookup = new global::System.Collections.Generic.Dictionary<{{Tokens.IdType}}, string>();
|
|
{{Tokens.ListOfIdentifersToNames}}
|
|
#if NET8_0_OR_GREATER
|
|
return global::System.Collections.Frozen.FrozenDictionary.ToFrozenDictionary(lookup);
|
|
#else
|
|
return new global::System.Collections.ObjectModel.ReadOnlyDictionary<{{Tokens.IdType}}, string>(lookup);
|
|
#endif
|
|
});
|
|
|
|
/// <summary>
|
|
/// Lazy name to id lookup.
|
|
/// </summary>
|
|
private static readonly global::System.Lazy<
|
|
global::System.Collections.Generic.IReadOnlyDictionary<string, {{Tokens.IdType}}>> s_nameToId =
|
|
new global::System.Lazy<
|
|
global::System.Collections.Generic.IReadOnlyDictionary<string, {{Tokens.IdType}}>>(() =>
|
|
{
|
|
var lookup = new global::System.Collections.Generic.Dictionary<string, {{Tokens.IdType}}>();
|
|
{{Tokens.ListOfNamesToIdentifiers}}
|
|
#if NET8_0_OR_GREATER
|
|
return global::System.Collections.Frozen.FrozenDictionary.ToFrozenDictionary(lookup);
|
|
#else
|
|
return new global::System.Collections.ObjectModel.ReadOnlyDictionary<string, {{Tokens.IdType}}>(lookup);
|
|
#endif
|
|
});
|
|
""");
|
|
}
|
|
}
|