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

291 lines
12 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.IO;
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Opc.Ua.Schema.Model;
using Opc.Ua.Tests;
namespace Opc.Ua.SourceGeneration.Generator.Tests
{
/// <summary>
/// Unit tests for the NodeStateGenerator class.
/// </summary>
[TestFixture]
[Category("Generator")]
[SetCulture("en-us")]
[SetUICulture("en-us")]
[Parallelizable]
public class NodeStateGeneratorTests
{
[SetUp]
public void SetUp()
{
m_mockFileSystem = new Mock<IFileSystem>();
m_mockModelDesign = new Mock<IModelDesign>();
m_mockTelemetry = new Mock<ITelemetryContext>();
// Setup default namespace
var targetNamespace = new Namespace
{
Value = "http://test.org/UA/",
Prefix = "Test",
Name = "TestNamespace"
};
m_mockModelDesign.Setup(m => m.TargetNamespace).Returns(targetNamespace);
m_mockModelDesign.Setup(m => m.Namespaces).Returns([targetNamespace]);
}
/// <summary>
/// Tests that the constructor throws ArgumentNullException when context is null.
/// </summary>
[Test]
public void Constructor_NullContext_ThrowsArgumentNullException()
{
// Arrange
GeneratorContext context = null;
// Act & Assert
Assert.Throws<ArgumentNullException>(() => new NodeStateGenerator(context));
}
/// <summary>
/// Tests that constructor creates instance with valid context.
/// </summary>
[Test]
public void Constructor_ValidContext_CreatesInstance()
{
// Arrange
m_context = new GeneratorContext
{
FileSystem = m_mockFileSystem.Object,
OutputFolder = "TestOutput",
ModelDesign = m_mockModelDesign.Object,
Telemetry = m_mockTelemetry.Object,
Options = new GeneratorOptions()
};
// Act
var generator = new NodeStateGenerator(m_context);
// Assert
Assert.That(generator, Is.Not.Null);
}
/// <summary>
/// Tests that Emit returns early without creating files when no node state classes exist.
/// </summary>
[Test]
public void Emit_NoNodeStateClasses_ReturnsEarlyWithoutCreatingFiles()
{
// Arrange
m_mockModelDesign.Setup(m => m.GetNodeDesigns()).Returns([]);
m_context = new GeneratorContext
{
FileSystem = m_mockFileSystem.Object,
OutputFolder = "TestOutput",
ModelDesign = m_mockModelDesign.Object,
Telemetry = m_mockTelemetry.Object,
Options = new GeneratorOptions()
};
var generator = new NodeStateGenerator(m_context);
// Act
generator.Emit();
// Assert - OpenWrite should not be called when there are no node state classes
m_mockFileSystem.Verify(
fs => fs.OpenWrite(It.IsAny<string>()),
Times.Never,
"OpenWrite should not be called when there are no node state classes");
}
[Test]
public void GenerateNodeStateGeneratorCodeTest()
{
// Arrange
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
using var fileSystem = new VirtualFileSystem();
// Act - Generate full stack
Generators.GenerateStack(StackGenerationType.All, fileSystem, string.Empty, telemetry);
// Assert - NodeState file should be created
var generatedFiles = fileSystem.CreatedFiles
.Where(c => c.EndsWith(".NodeStates.ex.g.cs", StringComparison.Ordinal))
.ToList();
Assert.That(generatedFiles, Is.Not.Empty,
"NodeStates.ex.g.cs file should be generated");
foreach (string file in generatedFiles)
{
string content = Encoding.UTF8.GetString(fileSystem.Get(file));
TestContext.Out.WriteLine("Generated file: {0} ({1} bytes)", file, content.Length);
// Verify basic structure
Assert.That(content, Does.Contain("// <auto-generated />"),
"Generated code should have auto-generated header");
Assert.That(content, Does.Contain("public static partial class OpcUaExtensions"),
"Generated code should contain OpcUaExtensions class");
Assert.That(content, Does.Contain("public static global::Opc.Ua.NodeStateCollection AddOpcUa"),
"Generated code should contain AddOpcUa method");
}
}
[Test]
public void GeneratedNodeStateGeneratorCodeCompilesTest()
{
// Arrange
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
using var fileSystem = new VirtualFileSystem();
// Act - Generate stack. The test compilation only provides
// Core stubs via WithOpcUaCoreStubs(), no Opc.Ua.Server
// reference, so suppress fluent-builder emission.
Generators.GenerateStack(StackGenerationType.All, fileSystem, string.Empty, telemetry,
new GeneratorOptions
{
OmitFluentApi = true
});
// Get all generated C# files
var generatedText = fileSystem.CreatedFiles
.Where(c => Path.GetExtension(c) == ".cs")
.ToDictionary(c => c, c => Encoding.UTF8.GetString(fileSystem.Get(c)));
// Verify generated code compiles
using var peStream = new MemoryStream();
bool success = OptimizationLevel.Debug
.CreateCompilation()
.AddCode(generatedText.WithOpcUaCoreStubs(), LanguageVersion.Latest)
.Emit(peStream)
.Check(TestContext.Out, out int errorCount, out int warnCount);
// Assert
Assert.That(success, Is.True,
$"Generated NodeStates should compile without errors. Errors: {errorCount}, Warnings: {warnCount}");
}
[Test]
public void NodeStateGeneratorCodeGeneratesCorrectMethodSignatures()
{
// Arrange
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
using var fileSystem = new VirtualFileSystem();
// Act
Generators.GenerateStack(StackGenerationType.All, fileSystem, string.Empty, telemetry);
// Find NodeStateGenerator files
var predefinedNodesFiles = fileSystem.CreatedFiles
.Where(c => c.EndsWith(".NodeStates.ex.g.cs", StringComparison.Ordinal))
.ToList();
Assert.That(predefinedNodesFiles, Is.Not.Empty);
foreach (string file in predefinedNodesFiles)
{
string content = Encoding.UTF8.GetString(fileSystem.Get(file));
// Check for proper method signatures
Assert.That(content, Does.Contain("global::Opc.Ua.ISystemContext context"),
"Methods should use ISystemContext parameter");
Assert.That(content, Does.Contain("state.NodeId ="),
"Code should set NodeId property");
Assert.That(content, Does.Contain("state.BrowseName ="),
"Code should set BrowseName property");
}
}
/// <summary>
/// Verifies the standard-model source generator declares typed
/// <c>MatrixOf&lt;T&gt;</c> State classes for the matrix-rank
/// VariableType (<c>XYArrayItemType</c>) and matrix-rank
/// Property / Variable instances
/// (<c>EnumDictionaryEntries</c>,
/// <c>FailureSystemIdentifier</c>).
/// </summary>
[Test]
public void NodeStateGeneratorEmitsMatrixOfTemplateParameterForStandardModel()
{
// Arrange
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
using var fileSystem = new VirtualFileSystem();
// Act
Generators.GenerateStack(StackGenerationType.All, fileSystem, string.Empty, telemetry,
new GeneratorOptions
{
OmitFluentApi = true
});
// Concatenate every generated source file so the snippet match
// is resilient to whichever file each declaration lives in.
string code = string.Join("\n", fileSystem.CreatedFiles
.Where(c => Path.GetExtension(c) == ".cs")
.Select(c => Encoding.UTF8.GetString(fileSystem.Get(c))));
Assert.Multiple(() =>
{
// VariableType template specialization: XYArrayItemType
// inherits the generic ArrayItemState chain with a
// MatrixOf<XVType> template parameter.
Assert.That(code, Does.Contain(
"global::Opc.Ua.ArrayItemState<global::Opc.Ua.MatrixOf<global::Opc.Ua.XVType>>"),
"XYArrayItemState should inherit ArrayItemState<MatrixOf<XVType>>.");
// Property-state instance matrix branch.
Assert.That(code, Does.Contain(
"global::Opc.Ua.PropertyState<global::Opc.Ua.MatrixOf<global::Opc.Ua.NodeId>>"),
"EnumDictionaryEntries should declare PropertyState<MatrixOf<NodeId>>.");
// BaseDataVariableState-instance matrix branch.
Assert.That(code, Does.Contain(
"global::Opc.Ua.BaseDataVariableState<global::Opc.Ua.MatrixOf<byte>>"),
"FailureSystemIdentifier should declare BaseDataVariableState<MatrixOf<byte>>.");
});
}
private Mock<IFileSystem> m_mockFileSystem;
private Mock<IModelDesign> m_mockModelDesign;
private Mock<ITelemetryContext> m_mockTelemetry;
private GeneratorContext m_context;
}
}