mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
Marc Schier
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
267 lines
9.3 KiB
XML
267 lines
9.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<UANodeSet xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd"
|
|
xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
|
|
<NamespaceUris>
|
|
<Uri>http://test.org/UA/DuplicateMethodNames/</Uri>
|
|
</NamespaceUris>
|
|
<Models>
|
|
<Model ModelUri="http://test.org/UA/DuplicateMethodNames/"
|
|
PublicationDate="2026-07-25T00:00:00Z"
|
|
Version="1.0.0">
|
|
<RequiredModel ModelUri="http://opcfoundation.org/UA/"
|
|
PublicationDate="2024-01-01T00:00:00Z"
|
|
Version="1.05.03" />
|
|
</Model>
|
|
</Models>
|
|
<Aliases>
|
|
<Alias Alias="Argument">i=296</Alias>
|
|
<Alias Alias="HasComponent">i=47</Alias>
|
|
<Alias Alias="HasModellingRule">i=37</Alias>
|
|
<Alias Alias="HasProperty">i=46</Alias>
|
|
<Alias Alias="HasSubtype">i=45</Alias>
|
|
<Alias Alias="HasTypeDefinition">i=40</Alias>
|
|
<Alias Alias="Int32">i=6</Alias>
|
|
<Alias Alias="String">i=12</Alias>
|
|
</Aliases>
|
|
|
|
<UAObjectType NodeId="ns=1;i=1000" BrowseName="1:AlphaType">
|
|
<DisplayName>AlphaType</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
|
|
<Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
|
|
</References>
|
|
</UAObjectType>
|
|
<UAMethod NodeId="ns=1;i=1001" BrowseName="1:Execute" ParentNodeId="ns=1;i=1000">
|
|
<DisplayName>Execute</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=1002</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=1003</Reference>
|
|
</References>
|
|
</UAMethod>
|
|
<UAVariable NodeId="ns=1;i=1002"
|
|
BrowseName="InputArguments"
|
|
ParentNodeId="ns=1;i=1001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>InputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Value</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=6</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
<UAVariable NodeId="ns=1;i=1003"
|
|
BrowseName="OutputArguments"
|
|
ParentNodeId="ns=1;i=1001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>OutputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Result</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=6</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
|
|
<UAObjectType NodeId="ns=1;i=2000" BrowseName="1:BetaType">
|
|
<DisplayName>BetaType</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
|
|
<Reference ReferenceType="HasComponent">ns=1;i=2001</Reference>
|
|
</References>
|
|
</UAObjectType>
|
|
<UAMethod NodeId="ns=1;i=2001" BrowseName="1:Execute" ParentNodeId="ns=1;i=2000">
|
|
<DisplayName>Execute</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=2002</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=2003</Reference>
|
|
</References>
|
|
</UAMethod>
|
|
<UAVariable NodeId="ns=1;i=2002"
|
|
BrowseName="InputArguments"
|
|
ParentNodeId="ns=1;i=2001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>InputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Value</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=6</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
<UAVariable NodeId="ns=1;i=2003"
|
|
BrowseName="OutputArguments"
|
|
ParentNodeId="ns=1;i=2001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>OutputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Result</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=6</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
|
|
<UAObjectType NodeId="ns=1;i=3000" BrowseName="1:GammaType">
|
|
<DisplayName>GammaType</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
|
|
<Reference ReferenceType="HasComponent">ns=1;i=3001</Reference>
|
|
</References>
|
|
</UAObjectType>
|
|
<UAMethod NodeId="ns=1;i=3001" BrowseName="1:Execute" ParentNodeId="ns=1;i=3000">
|
|
<DisplayName>Execute</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=3002</Reference>
|
|
<Reference ReferenceType="HasProperty">ns=1;i=3003</Reference>
|
|
</References>
|
|
</UAMethod>
|
|
<UAVariable NodeId="ns=1;i=3002"
|
|
BrowseName="InputArguments"
|
|
ParentNodeId="ns=1;i=3001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>InputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Value</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=12</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
<UAVariable NodeId="ns=1;i=3003"
|
|
BrowseName="OutputArguments"
|
|
ParentNodeId="ns=1;i=3001"
|
|
DataType="Argument"
|
|
ValueRank="1"
|
|
ArrayDimensions="1">
|
|
<DisplayName>OutputArguments</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="HasModellingRule">i=78</Reference>
|
|
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
|
|
</References>
|
|
<Value>
|
|
<uax:ListOfExtensionObject>
|
|
<uax:ExtensionObject>
|
|
<uax:TypeId>
|
|
<uax:Identifier>i=297</uax:Identifier>
|
|
</uax:TypeId>
|
|
<uax:Body>
|
|
<uax:Argument>
|
|
<uax:Name>Result</uax:Name>
|
|
<uax:DataType>
|
|
<uax:Identifier>i=12</uax:Identifier>
|
|
</uax:DataType>
|
|
<uax:ValueRank>-1</uax:ValueRank>
|
|
<uax:ArrayDimensions />
|
|
<uax:Description />
|
|
</uax:Argument>
|
|
</uax:Body>
|
|
</uax:ExtensionObject>
|
|
</uax:ListOfExtensionObject>
|
|
</Value>
|
|
</UAVariable>
|
|
</UANodeSet>
|