Files
Marc Schier 59374fc81d Generate MatrixOf<T> properties for OneOrMoreDimension types (#3625) (#3868)
# Description

Closes the original PR #3619 TODO and extends the `MatrixOf<T>` opt-in
to every place the source generator previously fell back to `Variant`
for `ValueRank="OneOrMoreDimensions"`.

## Generator changes (`Tools/Opc.Ua.SourceGeneration.Core`)

### Site 1 — DataType structure fields (`DataTypeGenerator.cs`)

Fields declared with matrix rank now render as
`global::Opc.Ua.MatrixOf<T>` instead of `Variant`, mirroring the
existing `ArrayOf<T>` treatment for `Array` rank. Encode/decode is
routed per the field's `DataType`:

| Field `DataType` | Property | Encode | Decode |
| ------------------------------------------------- |
--------------------------------------- |
----------------------------------------------------------- |
-----------------------------------------------------------------------
|
| primitive (`Boolean`, `Int32`, `String`, …) | `MatrixOf<bool>` etc. |
`WriteVariant(name, Variant.From(field));` |
`ReadVariant(name).GetBooleanMatrix();` (etc.) |
| `Structure` / abstract structure | `MatrixOf<ExtensionObject>` |
`WriteVariant(name, Variant.From(field));` |
`ReadVariant(name).GetExtensionObjectMatrix();` |
| concrete `IEncodeable` (e.g. `Vector`) | `MatrixOf<Vector>` |
`WriteEncodeableMatrix(name, field);` |
`ReadEncodeableMatrix<Vector>(name);` |
| typed enum | `MatrixOf<MyEnum>` | `WriteVariant(name,
Variant.From(field));` |
`ReadVariant(name).GetEnumerationMatrix<MyEnum>();` |
| `BaseDataType` / `Number` / `Integer` / `UInteger`|
`MatrixOf<Variant>` | `WriteVariant(name, Variant.From(field));` |
`ReadVariant(name).GetVariantMatrix();` |

### Site 2 — VariableType State classes (`NodeStateGenerator.cs`)

Replaces the original `// TODO: matrixOf;` from #3619. Concrete matrix
variable types now inherit the typed `<MatrixOf<T>>` chain. Standard
model:

- `XYArrayItemState :
ArrayItemState<MatrixOf<XVType>>.Implementation<StructureBuilder<XVType>>`

Abstract bases (`ArrayItemType`, `CubeItemType`, `ImageItemType`,
`NDimensionArrayItemType` — all `DataType="BaseDataType"`) keep the
existing `<T>` early-return.

### Site 3 — Property / Variable instances
(`ModelDesignExtensions.GetNodeStateClassName`)

Adds a `OneOrMoreDimensions` branch after the existing `Array` branch
and refines `IsTemplateParameterRequired` / `IsIndeterminateType` so
matrix-rank concrete types are no longer treated as indeterminate.
Standard model:

- `EnumDictionaryEntries: PropertyState<MatrixOf<NodeId>>`
- `FailureSystemIdentifier: BaseDataVariableState<MatrixOf<byte>>`

### Site 4 — Method parameters (`ClientApiGenerator` /
`ServerApiGenerator`)

`CollectParameters` opts in to `useMatrixTypeInsteadOfVariant` via
`SupportsMatrixOf()`. Zero standard-service impact (no OPC UA service
declares matrix args).

## Encoder / decoder API

Adds the parameterless overload `MatrixOf<T>
ReadEncodeableMatrix<T>(string? fieldName) where T : IEncodeable, new()`
to `IDecoder` and all implementations (`BinaryDecoder`, `JsonDecoder`,
`XmlDecoder`, `XmlParser`, `PubSubJsonDecoder`), mirroring the existing
`ReadEncodeableArray<T>(string?)` shape so the generator does not need a
runtime encoding-id lookup.

## Consumer migration

-
`Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs`
— `CreateXYArrayItemVariable` updated from
`Variant.FromStructure(ArrayOf.Wrapped(...))` to `new XVType[] { …
}.ToMatrixOf(5)` to match the new typed `XYArrayItemState.Value`
surface.

## Tests added

- **Generator snippet tests**:
`GenerateMatrixValueDataType_EmitsMatrixOfPropertiesAndCalls` (custom
data-type matrix fields) and
`NodeStateGeneratorEmitsMatrixOfTemplateParameterForStandardModel`
(standard-model VariableType + instance types).
- **Encoder round-trip**: new `EncodeableMatrixRoundTripTests` exercises
`WriteEncodeableMatrix` ↔ `ReadEncodeableMatrix<T>(string?)` through
Binary, XML, and parameterless overloads with null-matrix and populated
payloads.
- **Extension tests**: parameterised
`GetDotNetTypeName_OneOrMoreDimensionsValueRankWithBasicDataTypes_ReturnsCorrectMatrixOfType`
and `IsTemplateParameterRequired_OneOrMoreDimensionsWith…` tables;
`SupportsMatrixOf` coverage including `DiagnosticInfo → false` and
`ArgumentNullException` for null receiver.
- **Test resource models** (`TestDataDesign.xml`, `DemoModel.xml`,
`TestModel.xml`): new `MatrixValueDataType` /
`SampleStructureWithMatrixFields` exercise every branch end-to-end
through the existing `GenerateAndCompileDesignFileAsync` integration
test.

## Documentation

`Docs/MigrationGuide.md` — new sub-section "Generated data type fields
with ValueRank=OneOrMoreDimensions" with a per-`BasicDataType` mapping
table, the `IDecoder.ReadEncodeableMatrix<T>(string?)` overload note for
custom decoder implementations, and a sibling block covering
VariableType State classes, property-state instances, and service
parameters with before/after code samples.

## Verification

| Suite (net10.0) | Result |
| --------------- | ------ |
| `Opc.Ua.Types.Tests` | 7553 passed |
| `Opc.Ua.SourceGeneration.Core.Tests` | 3623 passed, 8 skipped
(analyzer-conditional) |
| `Opc.Ua.SourceGeneration.Stack.Tests` | 90 passed |
| `Opc.Ua.SourceGeneration.Tests` | 40 passed |
| `Opc.Ua.Server.Tests` (focused on `ReferenceServer`/`ArrayItem`) | 37
passed |
| Full `UA.slnx` build | 0 errors (42 pre-existing unrelated CA2007
warnings) |

The `// TODO: matrixOf;` comment is gone from `NodeStateGenerator.cs`.

## Related Issues

- Fixes #3625

## Checklist

- [x] 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.
- [x] 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.
2026-06-12 12:45:39 +02:00

273 lines
9.2 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;
using System.Collections.Generic;
using System.IO;
using Opc.Ua.Schema.Model;
namespace Opc.Ua.SourceGeneration
{
/// <summary>
/// Generates server API code for the stack.
/// </summary>
internal sealed class ServerApiGenerator : IGenerator
{
/// <summary>
/// Create server API generator.
/// </summary>
public ServerApiGenerator(IGeneratorContext context)
{
m_context = context ?? throw new ArgumentNullException(nameof(context));
}
/// <inheritdoc/>
public IEnumerable<Resource> Emit()
{
List<ServiceSet> serviceSets =
[
new ServiceSet(
"Session",
ServiceCategory.Discovery,
ServiceCategory.Session,
ServiceCategory.Attribute,
ServiceCategory.View,
ServiceCategory.Method,
ServiceCategory.MonitoredItem,
ServiceCategory.Subscription,
ServiceCategory.NodeManagement,
ServiceCategory.Query,
ServiceCategory.Test),
new ServiceSet("Discovery", ServiceCategory.Discovery, ServiceCategory.Registration)
];
string fileName = Path.Combine(
m_context.OutputFolder,
CoreUtils.Format("{0}.ServerBase.g.cs", Constants.CoreNamespacePrefix));
using TextWriter writer = m_context.FileSystem.CreateTextWriter(fileName);
using var templateWriter = new TemplateWriter(writer);
var template = new Template(templateWriter, ServerApiTemplates.File);
template.AddReplacement(Tokens.Prefix, Constants.CoreNamespacePrefix);
template.AddReplacement(Tokens.Namespace, Constants.CoreNamespace);
template.AddReplacement(
Tokens.ServiceSets,
ServerApiTemplates.ServiceSet,
serviceSets,
WriteTemplate_ServerApiServiceSet);
template.Render();
return [fileName.AsTextFileResource()];
}
/// <summary>
/// Writes the server API service set.
/// </summary>
private bool WriteTemplate_ServerApiServiceSet(IWriteContext context)
{
if (context.Target is not ServiceSet serviceSet)
{
return false;
}
Service[] serviceTypes = m_context.ModelDesign.GetListOfServices(serviceSet.Categories);
if (serviceTypes.Length == 0)
{
return false;
}
context.Template.AddReplacement(Tokens.ServiceSet, serviceSet.Name);
context.Template.AddReplacement(
Tokens.ServerApi,
ServerApiTemplates.InterfaceMethod,
serviceTypes,
WriteTemplate_InterfaceMethod);
context.Template.AddReplacement(
Tokens.ServerStubs,
ServerApiTemplates.Method,
serviceTypes,
WriteTemplate_ServerApiMethod);
return context.Template.Render();
}
/// <summary>
/// Writes an interface method declaration.
/// </summary>
private bool WriteTemplate_InterfaceMethod(IWriteContext context)
{
if (context.Target is not Service serviceType)
{
return false;
}
context.Template.AddReplacement(Tokens.Name, serviceType.Name);
context.Template.AddReplacement(
Tokens.ServerMethodAsync,
[serviceType],
context => LoadTemplate_AsyncParameters(
context,
isInterface: true));
return context.Template.Render();
}
/// <summary>
/// Writes a server API method.
/// </summary>
private bool WriteTemplate_ServerApiMethod(IWriteContext context)
{
if (context.Target is not Service serviceType)
{
return false;
}
context.Template.AddReplacement(Tokens.Name, serviceType.Name);
context.Template.AddReplacement(Tokens.Namespace, Constants.CoreNamespace);
context.Template.AddReplacement(
Tokens.ServerMethodAsync,
[serviceType],
context => LoadTemplate_AsyncParameters(
context,
isInterface: false));
return context.Template.Render();
}
/// <summary>
/// Writes an asynchronous method declaration.
/// </summary>
private TemplateString LoadTemplate_AsyncParameters(
ILoadContext context,
bool isInterface)
{
if (context.Target is not Service serviceType)
{
return null;
}
List<string> types = [];
List<string> names = [];
types.Add("global::Opc.Ua.SecureChannelContext");
names.Add("secureChannelContext");
CollectParameters(serviceType.Request, types, names);
types.Add("global::Opc.Ua.RequestLifetime");
names.Add("requestLifetime");
// write method type if not writing an interface declaration.
if (!isInterface)
{
context.Out.Write("public virtual async ");
}
context.Out.WriteLine(
"global::System.Threading.Tasks.ValueTask<{0}Response> {1}Async(",
serviceType.Name,
serviceType.Name);
WriteParameters(context, types, names);
// write closing semicolon for interface.
if (isInterface)
{
context.Out.WriteLine(";");
}
return null;
}
/// <summary>
/// Collects the parameters to write.
/// </summary>
private void CollectParameters(
DataTypeDesign dataType,
List<string> types,
List<string> names)
{
Parameter[] fields = dataType?.Fields;
if (fields != null)
{
foreach (Parameter field in fields)
{
DataTypeDesign datatype = field.DataTypeNode;
string typeName = datatype.GetDotNetTypeName(
field.ValueRank,
m_context.ModelDesign.TargetNamespace.Value,
m_context.ModelDesign.Namespaces,
nullable: NullableAnnotation.Nullable,
useMatrixTypeInsteadOfVariant: datatype.SupportsMatrixOf());
types.Add(typeName);
names.Add(field.Name.ToLowerCamelCase());
}
}
}
/// <summary>
/// Writes a set of method parameters.
/// </summary>
private static void WriteParameters(
ILoadContext context,
List<string> types,
List<string> names)
{
for (int ii = 0; ii < types.Count; ii++)
{
string typeName = types[ii];
context.Out.Write(" {0} {1}", typeName, names[ii]);
if (ii < types.Count - 1)
{
context.Out.WriteLine(",");
}
else
{
context.Out.Write(")");
}
}
}
/// <summary>
/// A set of services that are grouped into a single interface.
/// </summary>
private sealed record class ServiceSet(string Name, params ServiceCategory[] Categories);
private readonly IGeneratorContext m_context;
}
}