Files
romanett 41db5aca60 Fluent: publish Configure-created nodes' references on foreign-manager nodes (Objects folder placement) (#4331)
# Description

A node created inside the fluent `Configure` hook (source-generated
`[NodeManager]` partial, or the hosting `AddNodeManager(uri, build)`
route) had no way to appear below the Objects folder — or below any node
owned by another node manager.
`AsyncCustomNodeManager.AddReverseReferencesAsync` mirrors inverse
references into the `externalReferences` dictionary **before** the
`Configure` partials run, and the fluent surface never sees the
dictionary, so a configure-created node with an inverse `Organizes`
reference to `ObjectsFolder` existed and simulated but never showed up
under Objects.

This implements the three coordinated pieces proposed in #4329, plus the
companion namespace gap:

**1. Idempotent mirroring pass** (independently worthwhile hardening)
- `AddExternalReference` in `AsyncCustomNodeManager` and
`CustomNodeManager2` now has if-missing semantics (linear scan of the
per-source list).
- `TypeTable.AddEncoding` no longer appends a duplicate encoding id;
re-registering the same encoding is a succeeding no-op.
(`AddRootNotifierAsync` and the node-side `AddReferenceIfMissing` branch
were already idempotent.)

**2. Re-run the pass after `Configure`**
- New protected
`FluentNodeManagerBase.CompleteConfigureAsync(externalReferences, ct)`
wraps `AddReverseReferencesAsync` so hand-written managers using
`CreateFluentBuilder` benefit too.
- The generator-emitted `CreateAddressSpaceAsync` and the hosting
`FluentNodeManager` invoke it once between the `Configure` callbacks and
`Seal()`. Timing is safe: the master distributes `externalReferences`
only after every manager's `CreateAddressSpaceAsync` returns. Side
benefit: inverse `HasNotifier` references on configure-created event
sources get root-notifier registration for free.
- The hosting `FluentNodeManager`'s hand-rolled `externalReferences`
workaround for its root folder is deleted — the root's inverse
`Organizes` reference now flows through the shared pass (mirrored
exactly once, covered by a test).

**3. Discoverable fluent sugar**
- `OrganizedBy(parentId)` / `UnderObjectsFolder()` on `INodeBuilder`
write the inverse `Organizes` reference; with piece 2, placement is just
"write the inverse reference".
- A parentless `CreateInstance<TState>` on `INodeManagerBuilder` takes a
constructor-style factory (`p => new BoilerState(p)`, keeping the
surface reflection-free and AOT-safe), materializes the subtree from the
type model via `NodeState.Create`, rebases all NodeIds through the
manager's `INodeIdFactory`
(`AssignInstanceNodeId`/`AssignInstanceChildNodeIds` — the same pair the
generated factories use, so declaration-id children cannot collide with
the type model), and registers via `AddPredefinedNodeSynchronously`. The
Boiler #2 shape becomes fully fluent:

```csharp
builder.CreateInstance(
        new QualifiedName("Boiler #2", NamespaceIndexes[1]),
        p => new BoilerState(p))
    .Configure(n => n.UnderObjectsFolder());
```

**Companion gap, same theme:** `[NodeManager]` grows
`AdditionalNamespaceUris`, flowing through attribute discovery → binding
→ generator so the generated constructor reports a second (instance)
namespace at construction and the generated factory advertises it in
`NamespacesUris` — today `SetNamespaces` after construction is not
enough because `MasterNodeManager` builds its namespace routing from
what the manager reported when it was built.

**Scope boundary** (as discussed in the issue): startup-time
configuration only; for nodes created after startup the correct
primitive remains `IMasterNodeManager.AddReferencesAsync`.

**Reviewer notes**
- The generated-code change was validated against the real pipeline: a
forced fresh compile of `Opc.Ua.Server.Tests` (whose CoverageNodeSet
managers are `[NodeManager]`-generated) emits `await
CompleteConfigureAsync(externalReferences, cancellationToken)` between
`Configure` and `Seal()` and compiles against the real base class.
- The distribution consumer (`AddReferencesAsync`) already used
`AddReferenceIfMissing`, so the whole chain is defense-in-depth
idempotent.
- 15 new tests: double-run idempotence, second-pass pickup of
late-registered nodes, the new reference sugar, root-instance creation
incl. child-id rebasing and reference remapping, hosting end-to-end
Objects-folder placement, emitted-sequence and `AdditionalNamespaceUris`
generator tests, and a full Roslyn-pipeline attribute test. Docs updated
in `docs/NodeManagers.md` (new "Creating nodes under other managers'
nodes" section, attribute docs, fluent-surface sections).
- Verified locally: all touched projects build with 0 warnings; full
`Opc.Ua.Server.Tests` (4,725 passed / 0 failed / 5 skipped, net9.0),
`TypeTableTests` (113), `Opc.Ua.SourceGeneration.Core.Tests` (41),
`Opc.Ua.SourceGeneration.Tests` (132), and the Quickstarts.Servers
sample all pass.

## Related Issues

- Fixes #4329
- Motivating case: OPCFoundation/UA-.NETStandard-Samples#756 /
OPCFoundation/UA-.NETStandard-Samples#795 (Workshop/Boiler migration)

## 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.
- [ ] 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.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-08-29 10:38:56 +02:00

206 lines
8.8 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>
/// Emits a partial <c>{Namespace}NodeManager</c> deriving from
/// <c>AsyncCustomNodeManager</c> plus a matching
/// <c>{Namespace}NodeManagerFactory</c> implementing
/// <c>IAsyncNodeManagerFactory</c>. Opt-in via
/// <see cref="DesignFileOptions.GenerateNodeManager"/>.
/// </summary>
/// <remarks>
/// The generated manager wires the predefined nodes from the existing
/// <c>Add{Namespace}(NodeStateCollection, ISystemContext)</c> extension
/// (emitted by <see cref="NodeStateGenerator"/>) and exposes a
/// <c>partial void Configure(INodeManagerBuilder builder)</c> hook for
/// user code-behind. Lifecycle dispatchers (<c>AddPredefinedNode</c>,
/// <c>RemovePredefinedNode</c>, <c>OnMonitoredItemCreated</c>) are wired
/// to the runtime fluent dispatcher so callbacks registered via the
/// builder are invoked at the right times.
/// <para>
/// When an attribute-driven binding supplies a class name and namespace
/// override (via <see cref="DesignFileOptions.NodeManagerClassName"/> and
/// <see cref="DesignFileOptions.NodeManagerNamespace"/>), the generator
/// emits the partial under that user-chosen identity instead of the
/// design-derived defaults. Factory emission can be suppressed via
/// <see cref="DesignFileOptions.EmitNodeManagerFactory"/>.
/// </para>
/// </remarks>
internal sealed class NodeManagerGenerator : IGenerator
{
/// <summary>
/// Optional override for the namespace of the generated partial.
/// Defaults to the design's <c>TargetNamespace.Prefix</c>.
/// </summary>
public string OverrideNamespace { get; init; }
/// <summary>
/// Optional override for the class name of the generated partial.
/// Defaults to <c>{Prefix}NodeManager</c>.
/// </summary>
public string OverrideClassName { get; init; }
/// <summary>
/// When <c>false</c> the matching <c>{ClassName}Factory</c> is
/// not emitted. Defaults to <c>true</c>.
/// </summary>
public bool EmitFactory { get; init; } = true;
/// <summary>
/// Additional namespace URIs (beyond the model namespace) that
/// the generated constructor passes to the base node manager and
/// the generated factory advertises via <c>NamespacesUris</c>.
/// Typically a sample's separate instance namespace. Optional.
/// </summary>
public IReadOnlyList<string> AdditionalNamespaceUris { get; init; }
/// <summary>
/// Create node manager generator.
/// </summary>
public NodeManagerGenerator(IGeneratorContext context)
{
m_context = context ?? throw new ArgumentNullException(nameof(context));
}
/// <inheritdoc/>
public IEnumerable<Resource> Emit()
{
string nsPrefix = m_context.ModelDesign.TargetNamespace.Prefix;
string typeStem = nsPrefix.Replace(".", string.Empty, StringComparison.Ordinal);
string nsUriSymbol = m_context.ModelDesign.Namespaces
.GetConstantSymbolForNamespace(m_context.ModelDesign.TargetNamespace.Value);
string targetNamespace = string.IsNullOrEmpty(OverrideNamespace)
? nsPrefix
: OverrideNamespace;
string targetClass = string.IsNullOrEmpty(OverrideClassName)
? typeStem + "NodeManager"
: OverrideClassName;
string factoryClass = string.IsNullOrEmpty(OverrideClassName)
? typeStem + "NodeManagerFactory"
: OverrideClassName + "Factory";
string fileStem = string.IsNullOrEmpty(OverrideClassName)
? nsPrefix
: OverrideClassName;
var resources = new List<Resource>(2)
{
EmitNodeManager(targetNamespace, targetClass, typeStem, nsUriSymbol, fileStem)
};
if (EmitFactory)
{
resources.Add(EmitFactoryFile(targetNamespace, targetClass, factoryClass, nsUriSymbol, fileStem));
}
return resources;
}
private TextFileResource EmitNodeManager(
string targetNamespace,
string targetClass,
string typeStem,
string nsUriSymbol,
string fileStem)
{
string fileName = Path.Combine(
m_context.OutputFolder,
CoreUtils.Format("{0}.NodeManager.g.cs", fileStem));
using TextWriter writer = m_context.FileSystem.CreateTextWriter(fileName);
using var templateWriter = new TemplateWriter(writer);
var template = new Template(templateWriter, NodeManagerTemplates.File);
template.AddReplacement(Tokens.NamespacePrefix, targetNamespace);
template.AddReplacement(Tokens.Namespace, typeStem);
template.AddReplacement(Tokens.NodeManagerClassName, targetClass);
template.AddReplacement(Tokens.NamespaceUri, nsUriSymbol);
template.AddReplacement(
Tokens.AdditionalNamespaceUris,
FormatAdditionalNamespaceUris());
template.Render();
return fileName.AsTextFileResource();
}
/// <summary>
/// Renders the additional namespace URIs as a trailing
/// <c>, "uri"</c> argument list, or an empty string when none
/// were configured.
/// </summary>
private string FormatAdditionalNamespaceUris()
{
if (AdditionalNamespaceUris == null || AdditionalNamespaceUris.Count == 0)
{
return string.Empty;
}
var buffer = new System.Text.StringBuilder();
foreach (string uri in AdditionalNamespaceUris)
{
if (string.IsNullOrEmpty(uri))
{
continue;
}
buffer.Append(", ").Append(uri.AsStringLiteral());
}
return buffer.ToString();
}
private TextFileResource EmitFactoryFile(
string targetNamespace,
string targetClass,
string factoryClass,
string nsUriSymbol,
string fileStem)
{
string fileName = Path.Combine(
m_context.OutputFolder,
CoreUtils.Format("{0}.NodeManagerFactory.g.cs", fileStem));
using TextWriter writer = m_context.FileSystem.CreateTextWriter(fileName);
using var templateWriter = new TemplateWriter(writer);
var template = new Template(templateWriter, NodeManagerTemplates.FactoryFile);
template.AddReplacement(Tokens.NamespacePrefix, targetNamespace);
template.AddReplacement(Tokens.NodeManagerClassName, targetClass);
template.AddReplacement(Tokens.NodeManagerFactoryClassName, factoryClass);
template.AddReplacement(Tokens.NamespaceUri, nsUriSymbol);
template.AddReplacement(
Tokens.AdditionalNamespaceUris,
FormatAdditionalNamespaceUris());
template.Render();
return fileName.AsTextFileResource();
}
private readonly IGeneratorContext m_context;
}
}