mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +08:00
0357380335
**Stack 2/5** — base #4123. Part of the #4096 split; see #4096 for the overall picture. > Review after #4123. The diff shown against `master` will include #4123 until that merges. ## What this is Source generator only; no runtime library changes. ## Contents - **Typed NodeSet method signatures.** A method imported from a NodeSet now gets a typed signature. Methods that share a declared signature are grouped onto one generated `MethodType`, named after its owner when the plain name would collide, so two unrelated `Execute` methods no longer share a class. - **An override that keeps the signature it inherits keeps the declaration it overrides.** Pointing `MethodDeclarationNode` at the override itself made `MethodDeclarationId` self-referential. OPC 10000-4 lets a caller invoke a method with the NodeId of its declaration in the ObjectType *or any supertype*, and `MethodState.MethodDeclarationId` is what the server matches on, so `Call` stopped resolving and returned `Bad_MethodInvalid` for every alarm subtype. An override that genuinely changes its signature still becomes its own declaration. - **`StateNumbers` / `TransitionNumbers` were emitted empty for every NodeSet-sourced model**, because such children arrive as `VariableDesign` rather than `PropertyDesign` and were filtered out. Any companion model built from a NodeSet was writing `StateNumber = 0` on the wire — a Part 16 defect well beyond the models in this stack. The ModelDesign path is unchanged. - **Referenced models can contribute fluent accessors**, carried by a model dependency payload so a downstream model can extend an upstream one. ## Notes for the reviewer - `tests/Opc.Ua.SourceGeneration.Tests` is left at its `master` content here. Its new vendor-subtype test uses the Robotics NodeSet as its fixture, so it can only land with the Robotics change at the top of the stack (5/5). - `PumpInstanceNodeIdRegressionTests` gains six `InputArguments`/`OutputArguments` entries for argument-less standard condition methods. Typed method signatures materialise those properties from the `ConditionType` declaration even where the method takes none. That is a real deviation, pinned rather than hidden so it stays visible; it is worth a follow-up. ## Validation `dotnet build UA.slnx` — 0 errors. | Suite | Result | | --- | --- | | Opc.Ua.SourceGeneration.Core.Tests | 3739 / 0 | | Opc.Ua.SourceGeneration.Tests | 81 / 0 | | Opc.Ua.Di.Tests | 304 / 0 | | Opc.Ua.History.Tests | 506 / 0 | | Opc.Ua.Gds.Tests | 1095 / 0 | History and GDS are listed because they are what the method-declaration fix above is load-bearing for: without it they fail with 10 and 370 errors respectively. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8cbb8cd0-f0cb-4ab0-bea2-6202fbf69485
203 lines
7.6 KiB
C#
203 lines
7.6 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 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.IO;
|
|
using System.Runtime.CompilerServices;
|
|
using Opc.Ua.SourceGeneration.Dependency;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Information read from a referenced assembly's
|
|
/// <see cref="ModelDependencyAttribute"/>. Value-type equatable so the
|
|
/// incremental source-generator cache keys behave correctly.
|
|
/// </summary>
|
|
public readonly struct ModelDependencyReference : IEquatable<ModelDependencyReference>
|
|
{
|
|
/// <summary>
|
|
/// Create a reference.
|
|
/// </summary>
|
|
public ModelDependencyReference(
|
|
string assemblyName,
|
|
string modelUri,
|
|
string prefix,
|
|
string version,
|
|
string publicationDate,
|
|
string name = null,
|
|
string payload = null)
|
|
{
|
|
AssemblyName = assemblyName ?? string.Empty;
|
|
ModelUri = modelUri ?? string.Empty;
|
|
Prefix = prefix ?? string.Empty;
|
|
Version = version ?? string.Empty;
|
|
PublicationDate = publicationDate ?? string.Empty;
|
|
Name = name ?? string.Empty;
|
|
Payload = payload ?? string.Empty;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true when the entry has both a model URI and a C# prefix.
|
|
/// </summary>
|
|
public bool IsValid => ModelUri.Length != 0 && Prefix.Length != 0;
|
|
|
|
/// <summary>
|
|
/// The assembly the attribute was read from.
|
|
/// </summary>
|
|
public string AssemblyName { get; }
|
|
|
|
/// <summary>
|
|
/// The OPC UA model URI recorded in the attribute.
|
|
/// </summary>
|
|
public string ModelUri { get; }
|
|
|
|
/// <summary>
|
|
/// The C# namespace the assembly used for this model's generated types.
|
|
/// </summary>
|
|
public string Prefix { get; }
|
|
|
|
/// <summary>
|
|
/// The model version string (may be empty).
|
|
/// </summary>
|
|
public string Version { get; }
|
|
|
|
/// <summary>
|
|
/// The model publication date (ISO-8601; may be empty).
|
|
/// </summary>
|
|
public string PublicationDate { get; }
|
|
|
|
/// <summary>The C# identifier used for the model's name constant inside
|
|
/// the referenced assembly's <c>Namespaces</c> class (may be empty).</summary>
|
|
public string Name { get; }
|
|
|
|
/// <summary>
|
|
/// Base64-encoded Deflate-compressed <c>ModelDependencyV1</c>
|
|
/// payload. Empty on transitive-dependency entries; non-empty
|
|
/// only on the producing assembly's self-declaration entry.
|
|
/// </summary>
|
|
public string Payload { get; }
|
|
|
|
/// <summary>
|
|
/// Decodes and memoises the <see cref="Payload"/> as a
|
|
/// <see cref="ModelDependencyV1"/>. Returns <c>null</c> when the
|
|
/// payload is empty, malformed, or carries an unknown version.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Memoisation is keyed on the payload string to avoid re-decoding
|
|
/// the same multi-kilobyte byte block when the same dependency
|
|
/// flows through Roslyn's incremental cache multiple times.
|
|
/// </remarks>
|
|
public ModelDependencyV1 GetDependency()
|
|
{
|
|
if (string.IsNullOrEmpty(Payload))
|
|
{
|
|
return null;
|
|
}
|
|
return s_decoded.GetValue(Payload, DecodePayload).Value;
|
|
}
|
|
|
|
private static DecodedDependency DecodePayload(string payload)
|
|
{
|
|
try
|
|
{
|
|
return new DecodedDependency(ModelDependencyV1.FromBase64Payload(payload));
|
|
}
|
|
catch (Exception ex) when (
|
|
ex is InvalidDataException ||
|
|
ex is IOException ||
|
|
ex is ArgumentException ||
|
|
ex is FormatException ||
|
|
ex is OverflowException)
|
|
{
|
|
return new DecodedDependency(null);
|
|
}
|
|
}
|
|
|
|
private sealed class DecodedDependency
|
|
{
|
|
public DecodedDependency(ModelDependencyV1 value)
|
|
{
|
|
Value = value;
|
|
}
|
|
|
|
public ModelDependencyV1 Value { get; }
|
|
}
|
|
|
|
private static readonly ConditionalWeakTable<string, DecodedDependency> s_decoded
|
|
= new();
|
|
|
|
/// <inheritdoc/>
|
|
public bool Equals(ModelDependencyReference other)
|
|
{
|
|
return
|
|
string.Equals(AssemblyName, other.AssemblyName, StringComparison.Ordinal) &&
|
|
string.Equals(ModelUri, other.ModelUri, StringComparison.Ordinal) &&
|
|
string.Equals(Prefix, other.Prefix, StringComparison.Ordinal) &&
|
|
string.Equals(Version, other.Version, StringComparison.Ordinal) &&
|
|
string.Equals(PublicationDate, other.PublicationDate, StringComparison.Ordinal) &&
|
|
string.Equals(Name, other.Name, StringComparison.Ordinal) &&
|
|
string.Equals(Payload, other.Payload, StringComparison.Ordinal);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override bool Equals(object obj)
|
|
{
|
|
return obj is ModelDependencyReference other && Equals(other);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override int GetHashCode()
|
|
{
|
|
unchecked
|
|
{
|
|
int hash = StringComparer.Ordinal.GetHashCode(AssemblyName);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(ModelUri);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(Prefix);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(Version);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(PublicationDate);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(Name);
|
|
hash = (hash * 397) ^ StringComparer.Ordinal.GetHashCode(Payload);
|
|
return hash;
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public static bool operator ==(ModelDependencyReference left, ModelDependencyReference right)
|
|
{
|
|
return left.Equals(right);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public static bool operator !=(ModelDependencyReference left, ModelDependencyReference right)
|
|
{
|
|
return !left.Equals(right);
|
|
}
|
|
}
|
|
}
|