mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 15:22:15 +08:00
dc441a8b95
## Proposed changes When the source generator creates code for "instance" definitions (e.g., the `Server` object which has `ServerType` as its type definition), it currently uses the modelling rules specified on the **instance's children**, which may differ from the **type definition's children**. For example: - `ServerType` defines `UrisVersion` as `ModellingRule="Optional"` - `Server` instance overrides it to `ModellingRule="Mandatory"` This PR introduces two layers of modelling rule enforcement: ### 1. OPC UA promotion semantics (always active) Regardless of any configuration, the generator now enforces OPC UA modelling rule promotion semantics. Instances may only **promote** the type definition's rule: | Type Definition Rule | Allowed Instance Overrides | |---|---| | `Optional` | `Mandatory` | | `OptionalPlaceholder` | `Mandatory`, `MandatoryPlaceholder` | | `MandatoryPlaceholder` | `Mandatory` | Any other instance override (demotion) is silently rejected and the type definition's rule is used instead. This applies to both structural code generation decisions and the emitted runtime `ModellingRuleId`. ### 2. `UseTypeDefinitionModellingRules` option (opt-in) When enabled, the generator uses the type definition's modelling rules **unconditionally** — instance overrides are ignored entirely (even valid promotions). This is useful for stack generation where the type definition's semantics should be preserved exactly. - **Enabled by default** for stack generation (`Opc.Ua.SourceGeneration.Stack`) - **Disabled by default** for the Roslyn source generator (`Opc.Ua.SourceGeneration`), configurable via `ModelSourceGeneratorUseTypeDefinitionModellingRules` MSBuild property ### Key design decisions - A `TypeDefinitionModellingRule` property on `HierarchyNode` captures the type definition's original rule before instance overrides, updated through base→derived type-hierarchy merges but frozen once explicit instance overrides appear - A `GetEffectiveModellingRule()` helper with `IsValidPromotion()` centralizes the rule resolution logic across all structural check sites and runtime `ModellingRuleId` emission - Factory method emission (`LoadTemplate_ReplaceChild`) uses the instance's own modelling rule for mandatory/optional list classification so children the instance marks Mandatory are always created ## Related Issues - N/A ### Types of changes - [ ] Bugfix (non-breaking change which fixes an issue) - [x] Enhancement (non-breaking change which adds functionality) - [ ] Test enhancement (non-breaking change to increase test coverage) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected, requires version increase of Nuget packages) - [ ] Documentation Update (if none of the other choices apply) ## Checklist - [x] I have read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf). - [x] I ran tests locally with my changes, all passed. - [ ] I fixed all failing tests in the CI pipelines. - [ ] I fixed all introduced issues with CodeQL and LGTM. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added necessary documentation (if appropriate). - [ ] Any dependent changes have been merged and published in downstream modules. ## Further comments ### Files changed: | File | Change | |------|--------| | `Schema/ModelDesign.cs` | Added `TypeDefinitionModellingRule` property to `HierarchyNode` | | `Schema/ModelDesignValidator.cs` | Populates `TypeDefinitionModellingRule` during hierarchy merge; updates through base→derived type merges, freezes on instance overrides | | `GeneratorOptions.cs` | Added `UseTypeDefinitionModellingRules` option with full XML doc | | `NodeStateGenerator.cs` | `GetEffectiveModellingRule()` + `IsValidPromotion()` helpers; updated structural check sites and runtime `ModellingRuleId` emission; `NodeToGenerate` extended with `TypeDefinitionModellingRule` | | `StackGeneration.cs` | Enabled option for stack generation | | `ModelCompilationOptions.cs` | Added option + MSBuild property read | | `ModelCompilation.cs` | Wired option through to `GeneratorOptions` | | `OPCFoundation.Opc.Ua.SourceGeneration.props` | Registered MSBuild `CompilerVisibleProperty` | | `readme.md` | Documented new MSBuild property with promotion semantics |
135 lines
6.2 KiB
C#
135 lines
6.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.Collections.Generic;
|
|
using Microsoft.CodeAnalysis.Diagnostics;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Model compiler options
|
|
/// </summary>
|
|
internal sealed record class ModelCompilationOptions
|
|
{
|
|
/// <summary>
|
|
/// Model options
|
|
/// </summary>
|
|
public DesignFileOptions Options { get; set; }
|
|
|
|
/// <summary>
|
|
/// -useAllowSubtypes
|
|
/// </summary>
|
|
public bool UseAllowSubtypes { get; set; }
|
|
|
|
/// <summary>
|
|
/// -exclude [id;id;id]
|
|
/// </summary>
|
|
public IReadOnlyList<string> Exclude { get; set; }
|
|
|
|
/// <summary>
|
|
/// Opt out of <see cref="ObjectTypeProxyGenerator"/>. By
|
|
/// default the source generator emits a typed asynchronous
|
|
/// client wrapper (<c>{TypeName}Client</c>) for every
|
|
/// <c>ObjectType</c> in the model — including types without
|
|
/// methods, so downstream models can derive from the emitted
|
|
/// proxies. Each generated proxy inherits from the proxy of its
|
|
/// parent ObjectType (forming a chain that mirrors the OPC UA
|
|
/// type hierarchy and ultimately roots at the hand-authored
|
|
/// <c>Opc.Ua.ObjectTypeClient</c> base). Methods that share a
|
|
/// name with an ancestor method are emitted with the C#
|
|
/// <c>new</c> modifier so the derived signature shadows the
|
|
/// ancestor. Set this to <c>true</c> to suppress proxy
|
|
/// emission. Surfaced from MSBuild via the
|
|
/// <c>ModelSourceGeneratorOmitObjectTypeProxies</c> property.
|
|
/// </summary>
|
|
public bool OmitObjectTypeProxies { get; set; }
|
|
|
|
/// <summary>
|
|
/// Optional override for the C# namespace used by classes emitted
|
|
/// by the <see cref="ObjectTypeProxyGenerator"/>. By default
|
|
/// proxies are emitted into the model's own namespace (i.e. the
|
|
/// C# prefix of the model's target namespace) — for example the
|
|
/// standard UA NodeSet emits into <c>Opc.Ua</c>. Set this option
|
|
/// to redirect proxy emission into a different namespace.
|
|
/// Surfaced from MSBuild via the
|
|
/// <c>ModelSourceGeneratorObjectTypeProxyNamespace</c> property.
|
|
/// </summary>
|
|
public string ObjectTypeProxyNamespace { get; set; }
|
|
|
|
/// <summary>
|
|
/// When set to <c>true</c>, the generator uses the modelling rules
|
|
/// from the referenced type definition unconditionally for all
|
|
/// structural code generation decisions and the emitted runtime
|
|
/// <c>ModellingRuleId</c>. When off (default), the generator
|
|
/// enforces OPC UA modelling rule promotion semantics —
|
|
/// instances may only promote, never demote, the type
|
|
/// definition's rule.
|
|
/// Surfaced from MSBuild via the
|
|
/// <c>ModelSourceGeneratorUseTypeDefinitionModellingRules</c> property.
|
|
/// </summary>
|
|
public bool UseTypeDefinitionModellingRules { get; set; }
|
|
|
|
/// <summary>
|
|
/// Get options from options provider
|
|
/// </summary>
|
|
/// <param name="provider"></param>
|
|
/// <returns></returns>
|
|
public static ModelCompilationOptions From(AnalyzerConfigOptionsProvider provider)
|
|
{
|
|
return new ModelCompilationOptions
|
|
{
|
|
Options = new DesignFileOptions
|
|
{
|
|
Version = provider.GlobalOptions.GetString(
|
|
nameof(DesignFileOptions.Version)) ??
|
|
"v105",
|
|
StartId = (uint)provider.GlobalOptions.GetInteger(
|
|
nameof(DesignFileOptions.StartId)),
|
|
ModelVersion = provider.GlobalOptions.GetString(
|
|
nameof(DesignFileOptions.ModelVersion)),
|
|
ModelPublicationDate = provider.GlobalOptions.GetString(
|
|
nameof(DesignFileOptions.ModelPublicationDate)),
|
|
ReleaseCandidate = provider.GlobalOptions.GetBool(
|
|
nameof(DesignFileOptions.ReleaseCandidate)),
|
|
GenerateNodeManager = provider.GlobalOptions.GetBool(
|
|
nameof(DesignFileOptions.GenerateNodeManager))
|
|
},
|
|
Exclude = provider.GlobalOptions.GetStrings(nameof(Exclude)),
|
|
UseAllowSubtypes = provider.GlobalOptions.GetBool(nameof(UseAllowSubtypes)),
|
|
OmitObjectTypeProxies = provider.GlobalOptions.GetBool(
|
|
nameof(OmitObjectTypeProxies)),
|
|
ObjectTypeProxyNamespace = provider.GlobalOptions.GetString(
|
|
nameof(ObjectTypeProxyNamespace)),
|
|
UseTypeDefinitionModellingRules = provider.GlobalOptions.GetBool(
|
|
nameof(UseTypeDefinitionModellingRules))
|
|
};
|
|
}
|
|
}
|
|
}
|