node-opcua-address-space 2.184.8 → 2.186.0

package/api/helpers/argument_list.ts

@@ -293,7 +293,7 @@ export function verifyArguments_ArgumentList(
         return { inputArgumentResults, statusCode: StatusCodes.BadTooManyArguments };
     }
 
-    // Part 4 5.11.2 (Call): when one of the input arguments is not valid the
+    // OPC 10000-4 v1.05.07 §5.12.2 (Call): when one of the input arguments is not valid the
     // operation statusCode is BadInvalidArgument and inputArgumentResults[i]
     // carries the per-argument reason (BadTypeMismatch for a wrong DataType or
     // ValueRank, BadOutOfRange for a value outside the range). A per-argument

package/api/helpers/call_helpers.ts

@@ -2,13 +2,13 @@
  * @module node-opcua-address-space
  */
 
-import type { IAddressSpace, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
+import type { BaseNode, IAddressSpace, ISessionContext, UAMethod, UAObject, UAObjectType } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
-import { NodeClass } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
+import { BrowseDirection, NodeClass } from "node-opcua-data-model";
+import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import type { CallMethodRequest } from "node-opcua-service-call";
-import { StatusCodes } from "node-opcua-status-code";
-import type { CallMethodResultOptions } from "node-opcua-types";
+import { type StatusCode, StatusCodes } from "node-opcua-status-code";
+import { type CallMethodResultOptions, PermissionType } from "node-opcua-types";
 import type { Variant } from "node-opcua-variant";
 
 import { getMethodDeclaration_ArgumentList, verifyArguments_ArgumentList } from "./argument_list.js";
@@ -32,6 +32,133 @@ import { resolveOpaqueOnAddressSpace } from "./resolve_opaque_on_address_space.j
 //                               A server shall accept a ByteString if an array of Byte is expected.
 // BadNoCommunication
 
+// guards against a cyclic MethodDeclarationId chain or a runaway type hierarchy
+const maxDepth = 64;
+
+/** true when `method` was instantiated from `declaration`, directly or through a chain of MethodDeclarationId */
+function isDeclaredBy(method: UAMethod, declaration: UAMethod): boolean {
+    let current: UAMethod = method;
+    for (let i = 0; i < maxDepth; i++) {
+        const declarationId = current.methodDeclarationId;
+        if (!declarationId || sameNodeId(declarationId, current.nodeId)) {
+            return false;
+        }
+        if (sameNodeId(declarationId, declaration.nodeId)) {
+            return true;
+        }
+        const next = current.addressSpace.findNode(declarationId);
+        if (!next || next.nodeClass !== NodeClass.Method) {
+            return false;
+        }
+        current = next as UAMethod;
+    }
+    return false;
+}
+
+/**
+ * the Method whose implementation runs: the target's own, else the one named by methodId, else the first
+ * bound Method along the target's MethodDeclarationId chain (an instance created before its type's method was
+ * bound). The target itself when none is bound: execute() then reports it as not bound.
+ */
+function implementationOf(targetMethod: UAMethod, methodObj: UAMethod): UAMethod {
+    if (targetMethod.isBound()) {
+        return targetMethod;
+    }
+    if (methodObj.isBound()) {
+        return methodObj;
+    }
+    let current: UAMethod = targetMethod;
+    for (let i = 0; i < maxDepth; i++) {
+        const declarationId = current.methodDeclarationId;
+        if (!declarationId || sameNodeId(declarationId, current.nodeId)) {
+            break;
+        }
+        const next = current.addressSpace.findNode(declarationId);
+        if (!next || next.nodeClass !== NodeClass.Method) {
+            break;
+        }
+        current = next as UAMethod;
+        if (current.isBound()) {
+            return current;
+        }
+    }
+    return targetMethod;
+}
+
+/** the ObjectType of `object` (or `object` itself when it is an ObjectType) and all its supertypes */
+function typeHierarchyOf(object: UAObject | UAObjectType): UAObjectType[] {
+    const types: UAObjectType[] = [];
+    let type: UAObjectType | null =
+        object.nodeClass === NodeClass.ObjectType ? (object as UAObjectType) : (object as UAObject).typeDefinitionObj;
+    while (type && types.length < maxDepth) {
+        types.push(type);
+        type = type.subtypeOfObj;
+    }
+    return types;
+}
+
+/**
+ * true when `declaringNode` is an ObjectType that defines methods for `object`: one of its types or supertypes,
+ * or an InterfaceType (or a supertype of one) that the object or one of its types implements (OPC 10000-3 v1.05.06 §4.10)
+ */
+function isTypeOf(declaringNode: BaseNode | null, object: UAObject | UAObjectType): boolean {
+    if (!declaringNode || declaringNode.nodeClass !== NodeClass.ObjectType) {
+        return false;
+    }
+    const types = typeHierarchyOf(object);
+    if (types.includes(declaringNode as UAObjectType)) {
+        return true;
+    }
+    if (!object.addressSpace.findReferenceType("HasInterface")) {
+        return false;
+    }
+    for (const node of [object, ...types]) {
+        for (const iface of node.findReferencesExAsObject("HasInterface", BrowseDirection.Forward)) {
+            if (
+                iface === declaringNode ||
+                (iface.nodeClass === NodeClass.ObjectType && (iface as UAObjectType).isSubtypeOf(declaringNode as UAObjectType))
+            ) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+/**
+ * OPC 10000-4 v1.05.07 §5.12.2 Call, methodId: "If the objectId is the NodeId of an Object, the methodId is either the
+ * NodeId of the Method that is a component of the Object instance or the NodeId of the Method in the ObjectType
+ * that defines the Method. Independent of the methodId parameter, the RolePermissions are always verified with
+ * the Method Node that is the target of a HasComponent from the Node defined by objectId."
+ *
+ * Returns the Method whose AccessRestrictions and RolePermissions govern the call:
+ * - `methodObj` itself when it is a component of `object`;
+ * - otherwise the component of `object` instantiated from `methodObj` (MethodDeclarationId), or, when
+ *   `methodObj` belongs to a type of `object`, the component with the same BrowseName;
+ * - `methodObj` when it belongs to a type of `object` that has no such component (a method called on its
+ *   ObjectType, or an optional method not instantiated);
+ * - BadMethodInvalid when `methodObj` is neither a method of `object` nor one of its types.
+ */
+function resolveMethodOfObject(
+    object: UAObject | UAObjectType,
+    methodObj: UAMethod
+): { statusCode: StatusCode; method?: UAMethod } {
+    if (object.getMethodById(methodObj.nodeId)) {
+        return { statusCode: StatusCodes.Good, method: methodObj };
+    }
+    const methods = object.getMethods();
+    const instantiated = methods.find((m) => isDeclaredBy(m, methodObj));
+    if (instantiated) {
+        return { statusCode: StatusCodes.Good, method: instantiated };
+    }
+    if (!isTypeOf(methodObj.parent, object)) {
+        return { statusCode: StatusCodes.BadMethodInvalid };
+    }
+    const browseName = methodObj.browseName.toString();
+    const sameName = methods.find((m) => m.browseName.toString() === browseName);
+    return { statusCode: StatusCodes.Good, method: sameName || methodObj };
+}
+
 export async function callMethodHelper(
     context: ISessionContext,
     addressSpace: IAddressSpace,
@@ -60,7 +187,14 @@ export async function callMethodHelper(
         return { statusCode: StatusCodes.BadMethodInvalid };
     }
 
-    const response1 = getMethodDeclaration_ArgumentList(addressSpace, objectId, methodId);
+    const resolved = resolveMethodOfObject(object, methodObj);
+    if (!resolved.method) {
+        return { statusCode: resolved.statusCode };
+    }
+    // the Method whose AccessRestrictions and RolePermissions apply, whatever methodId named
+    const targetMethod = resolved.method;
+
+    const response1 = getMethodDeclaration_ArgumentList(addressSpace, objectId, targetMethod.nodeId);
 
     if (response1.statusCode.isNotGood()) {
         return { statusCode: response1.statusCode };
@@ -81,7 +215,18 @@ export async function callMethodHelper(
     try {
         await resolveOpaqueOnAddressSpace(addressSpace, inputArguments);
 
-        const callMethodResponse = await methodObj.execute(object, inputArguments, context);
+        // execute() verifies the method it runs on; when the instance method has no implementation of its own,
+        // the declaration's runs, so the instance method is verified here first, in the same order as execute()
+        const executingMethod = implementationOf(targetMethod, methodObj);
+        if (executingMethod !== targetMethod) {
+            if (context.isAccessRestricted(targetMethod)) {
+                return { statusCode: StatusCodes.BadSecurityModeInsufficient };
+            }
+            if (!context.checkPermission(targetMethod, PermissionType.Call)) {
+                return { statusCode: StatusCodes.BadUserAccessDenied };
+            }
+        }
+        const callMethodResponse = await executingMethod.execute(object, inputArguments, context);
         callMethodResponse.inputArgumentResults = callMethodResponse.inputArgumentResults || response.inputArgumentResults || [];
         assert(callMethodResponse.statusCode);
 

package/api/loader/nodeset_record.ts

@@ -29,7 +29,7 @@ import type { EnumFieldOptions, StructureFieldOptions } from "node-opcua-xml2jso
  * was built from, and nothing else would ever invalidate it. The source digest cannot: the source
  * did not change. This number is the only lever.
  */
-export const NODESET_RECORD_SCHEMA = 5;
+export const NODESET_RECORD_SCHEMA = 6;
 
 export interface NodesetModelRecord {
     modelUri: string;

package/api/loader/nodeset_record_applier.ts

@@ -526,6 +526,8 @@ export class NodesetRecordApplier implements NodesetRecordConsumer {
             references: this.references(record),
             // documentation, not behaviour, but the document said it and it must survive the trip
             releaseStatus: record.releaseStatus,
+            nodesetDocumentation: record.documentation,
+            nodesetCategory: record.category,
             ...this.permissions(record)
         };
     }
@@ -633,6 +635,7 @@ export class NodesetRecordApplier implements NodesetRecordConsumer {
                 const params = {
                     ...this.common(record),
                     isAbstract: record.isAbstract,
+                    symmetric: !!record.symmetric,
                     displayName: record.displayName,
                     description: record.description,
                     inverseName: record.inverseName

package/api/loader/nodeset_xml_producer.ts

@@ -216,6 +216,7 @@ export function makeXmlNodesetRecordReader(): XmlNodesetRecordReader {
         init(this: NodeState, _name: string, attrs: XmlAttributes) {
             this.obj = baseRecord(NodeClass.ReferenceType, attrs);
             this.obj.isAbstract = coerceBoolean(attrs.IsAbstract);
+            this.obj.symmetric = coerceBoolean(attrs.Symmetric);
         },
         ...emit,
         parser: {

package/api/session_context.ts

@@ -32,6 +32,7 @@ import {
     AnonymousIdentityToken,
     MessageSecurityMode,
     PermissionType,
+    type RequestHeader,
     type RolePermissionType,
     UserNameIdentityToken,
     X509IdentityToken
@@ -192,6 +193,8 @@ export interface SessionContextOptions {
     session?: ISessionBase /* ServerSession */;
     object?: UAObject | UAObjectType;
     server?: IServerBase /* OPCUAServer*/;
+    /** see {@link SessionContext.requestHeader} */
+    requestHeader?: RequestHeader;
 }
 
 function getPermissionForRole(
@@ -442,6 +445,7 @@ export class SessionContext implements ISessionContext {
     public continuationPoints: Buffer[] = [];
     public readonly session?: ISessionBase;
     public readonly server?: IServerBase;
+    public readonly requestHeader?: RequestHeader;
 
     constructor(options?: SessionContextOptions) {
         options = options || {};
@@ -449,6 +453,31 @@ export class SessionContext implements ISessionContext {
         this.object = options.object;
         this.server = options.server;
         this.currentTime = undefined;
+        this.requestHeader = options.requestHeader;
+    }
+
+    /**
+     * A SessionContext identical to this one, plus `requestHeader` (and the `getAuditEntryId()`
+     * it feeds). Deliberately a **new** instance rather than a mutation of `this`: build one per
+     * Call service invocation (see opcua_server.ts _on_CallRequest), never by writing onto the
+     * Session's own long-lived sessionContext. That object is shared and read concurrently by
+     * every request in flight on the Session (ServerSession#sessionContext is one instance for
+     * the Session's whole lifetime - see also UAMethodImpl#execute, which already mutates
+     * `context.object` on whatever context it is handed), so a shared mutable RequestHeader
+     * field would let two Calls running at once on the same Session overwrite or read back the
+     * wrong id. A fresh instance per Call has none of that: nothing but the caller holds a
+     * reference to it.
+     */
+    public withRequestHeader(requestHeader: RequestHeader): SessionContext {
+        return new SessionContext({ session: this.session, object: this.object, server: this.server, requestHeader });
+    }
+
+    /**
+     * `requestHeader?.auditEntryId`, or `undefined` when either is absent or the id is empty -
+     * see {@link ISessionContext.getAuditEntryId}.
+     */
+    public getAuditEntryId(): string | undefined {
+        return this.requestHeader?.auditEntryId || undefined;
     }
 
     /**
@@ -483,6 +512,15 @@ export class SessionContext implements ISessionContext {
         return this.session?.getEndpointUrl?.() ?? null;
     }
 
+    /**
+     * The Session's preferred locales, most preferred first (OPC 10000-4 v1.05.07 §5.7.3
+     * ActivateSession localeIds, §5.4 Locale Negotiation). `[]` without a Session, or before
+     * the Session's first successful ActivateSession with a non-empty localeIds.
+     */
+    public getPreferredLocales(): string[] {
+        return this.session?.localeIds ? [...this.session.localeIds] : [];
+    }
+
     public toJSON(): Record<string, string | null> {
         return {
             userName: this.getUserName(),

package/dist/api/helpers/argument_list.js

@@ -240,7 +240,7 @@ export function verifyArguments_ArgumentList(addressSpace, methodInputArguments,
                 inputArguments.length);
         return { inputArgumentResults, statusCode: StatusCodes.BadTooManyArguments };
     }
-    // Part 4 5.11.2 (Call): when one of the input arguments is not valid the
+    // OPC 10000-4 v1.05.07 §5.12.2 (Call): when one of the input arguments is not valid the
     // operation statusCode is BadInvalidArgument and inputArgumentResults[i]
     // carries the per-argument reason (BadTypeMismatch for a wrong DataType or
     // ValueRank, BadOutOfRange for a value outside the range). A per-argument

package/dist/api/helpers/argument_list.js.map

@@ -1 +1 @@
-{"version":3,"file":"argument_list.js","sourceRoot":"","sources":["../../../api/helpers/argument_list.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAqB,0BAA0B,EAA2B,MAAM,0BAA0B,CAAC;AAClH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAA4B,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAe,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE7E,OAAO,EAAmB,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAgB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,MAAM,QAAQ,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;AAChD,MAAM,UAAU,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;AACpD,MAAM,OAAO,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;AAEhD,SAAS,iBAAiB,CAAC,QAAkB;IACzC,OAAO,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC/C,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,UAAyB,EAAE,IAAe,EAAE,MAA0B;IACtG,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;IAE1C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAClC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAE/B,uDAAuD;IAEvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAEtB,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACX,qEAAqE;gBACjE,iFAAiF,CACxF,CAAC;QACN,CAAC;QACD,2DAA2D;QAE3D,sBAAsB;QACtB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC;QAE/E,IAAI,OAAO,EAAE,CAAC;YACV,WAAW,CAAC,KAAkB,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,UAAyB,EAAE,MAAoB;IAC/E,oBAAoB;IACpB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACX,qEAAqE;YACjE,iFAAiF,CACxF,CAAC;IACN,CAAC;IAED,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,IAAI,KAAc,CAAC;IAEnB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACX,qEAAqE;gBACjE,iFAAiF,CACxF,CAAC;QACN,CAAC;QACD,oDAAoD;QACpD,sBAAsB;QACtB,uDAAuD;QACvD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC;QAE5D,IAAI,OAAO,EAAE,CAAC;YACV,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,WAA0B,EAAE,IAAe;IACpF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAI,0BAA0B,EAAE,CAAC;IAChD,mBAAmB,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC,MAAM,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,YAA2B,EAC3B,QAAgB,EAChB,QAAgB;IAEhB,+BAA+B;IAC/B,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAa,CAAC;IACxD,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,oBAAoB;QACpB,OAAO,IAAI,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9D,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAa,CAAC;IAC3D,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,wDAAwD;QACxD,2BAA2B;QAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAa,CAAC;QAC3D,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,SAAS,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YAC/D,UAAU,CAAC,4BAA4B,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YACnG,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACxD,CAAC;IACL,CAAC;IAED,MAAM,mBAAmB,GAAG,YAAY,CAAC,mBAAmB,CAAC;IAC7D,MAAM,iBAAiB,GAAG,YAAY,CAAC,QAAQ,CAAC,mBAAmB,CAAa,CAAC;IACjF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACrB,sDAAsD;QACtD,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;IAC7E,CAAC;IACD,oBAAoB;IACpB,IAAI,iBAAiB,CAAC,SAAS,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,cAAc,CAAC,aAAuB,EAAE,GAAY;IACzD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,KAAK,gBAAgB,CAAC,KAAK,CAAC;IACzD,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,KAAK,gBAAgB,CAAC,MAAM,CAAC;IAE3D,IAAI,aAAa,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QAC9B,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;IACL,CAAC;SAAM,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QACxC,SAAS;QACT,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;SAAM,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QACxC,MAAM;IACV,CAAC;SAAM,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;QACxC,mBAAmB;QACnB,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;SAAM,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;QACvC,kBAAkB;QAClB,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,YAA2B,EAAE,aAAuB,EAAE,GAAY;IAC9F,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAElD,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3E,oBAAoB;IACpB,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,oBAAoB;QACpB,OAAO,IAAI,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACrF,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,aAAa,CAAC,SAAS,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjE,6DAA6D;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,oBAAoB;IACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,IAAI,QAAQ,CAAC,wBAAwB,EAAE,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,oBAAoB;IACpB,IAAI,OAAO,EAAE,CAAC;QACV,OAAO,IAAI,QAAQ,CAAC,2BAA2B,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,QAAQ,CAAC,wBAAwB,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,KAAK,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qDAAqD;IACrD,IAAI,cAAc,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1C,uDAAuD;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,4DAA4D;QAC5D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAA+B;IAC/B,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;QACtF,IAAI,YAAY,IAAI,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;GACG;AACH,MAAM,UAAU,4BAA4B,CACxC,YAA2B,EAC3B,oBAAgC,EAChC,cAAyB;IAKzB,MAAM,oBAAoB,GAAiB,oBAAoB,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE;QAC/F,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,WAAW,CAAC,SAAS,CAAC;QACjC,CAAC;aAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,CAAC;YACvE,OAAO,WAAW,CAAC,eAAe,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,OAAO,WAAW,CAAC,IAAI,CAAC;QAC5B,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,oBAAoB,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;QACtD,oBAAoB;QACpB,OAAO;YACH,QAAQ,CACJ,+BAA+B;gBAC3B,6EAA6E;gBAC7E,uBAAuB;gBACvB,oBAAoB,CAAC,MAAM;gBAC3B,EAAE;gBACF,uBAAuB;gBACvB,cAAc,CAAC,MAAM,CAC5B,CAAC;QAEN,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,WAAW,CAAC,mBAAmB,EAAE,CAAC;IACjF,CAAC;IAED,IAAI,oBAAoB,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;QACtD,oBAAoB;QACpB,OAAO;YACH,QAAQ,CACJ,gCAAgC;gBAC5B,kFAAkF;gBAClF,uBAAuB;gBACvB,oBAAoB,CAAC,MAAM;gBAC3B,EAAE;gBACF,uBAAuB;gBACvB,cAAc,CAAC,MAAM,CAC5B,CAAC;QAEN,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,WAAW,CAAC,mBAAmB,EAAE,CAAC;IACjF,CAAC;IAED,yEAAyE;IACzE,yEAAyE;IACzE,2EAA2E;IAC3E,0EAA0E;IAC1E,0EAA0E;IAC1E,iCAAiC;IACjC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;IAE1F,OAAO;QACH,oBAAoB;QACpB,UAAU;KACb,CAAC;AACN,CAAC"}
+{"version":3,"file":"argument_list.js","sourceRoot":"","sources":["../../../api/helpers/argument_list.ts"],"names":[],"mappings":"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"}

package/dist/api/helpers/call_helpers.d.ts

@@ -3,6 +3,6 @@
  */
 import type { IAddressSpace, ISessionContext } from "node-opcua-address-space-base";
 import type { CallMethodRequest } from "node-opcua-service-call";
-import type { CallMethodResultOptions } from "node-opcua-types";
+import { type CallMethodResultOptions } from "node-opcua-types";
 export declare function callMethodHelper(context: ISessionContext, addressSpace: IAddressSpace, callMethodRequest: CallMethodRequest): Promise<CallMethodResultOptions>;
 //# sourceMappingURL=call_helpers.d.ts.map

package/dist/api/helpers/call_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call_helpers.d.ts","sourceRoot":"","sources":["../../../api/helpers/call_helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAsB,MAAM,+BAA+B,CAAC;AAIxG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAwBhE,wBAAsB,gBAAgB,CAClC,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,iBAAiB,GACrC,OAAO,CAAC,uBAAuB,CAAC,CA+DlC"}
+{"version":3,"file":"call_helpers.d.ts","sourceRoot":"","sources":["../../../api/helpers/call_helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAY,aAAa,EAAE,eAAe,EAAoC,MAAM,+BAA+B,CAAC;AAIhI,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,KAAK,uBAAuB,EAAkB,MAAM,kBAAkB,CAAC;AAuJhF,wBAAsB,gBAAgB,CAClC,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,iBAAiB,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAiFlC"}

package/dist/api/helpers/call_helpers.js

@@ -2,9 +2,10 @@
  * @module node-opcua-address-space
  */
 import { assert } from "node-opcua-assert";
-import { NodeClass } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
+import { BrowseDirection, NodeClass } from "node-opcua-data-model";
+import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { StatusCodes } from "node-opcua-status-code";
+import { PermissionType } from "node-opcua-types";
 import { getMethodDeclaration_ArgumentList, verifyArguments_ArgumentList } from "./argument_list.js";
 import { resolveOpaqueOnAddressSpace } from "./resolve_opaque_on_address_space.js";
 // Symbolic Id                   Description
@@ -24,6 +25,121 @@ import { resolveOpaqueOnAddressSpace } from "./resolve_opaque_on_address_space.j
 //                               A ByteString is structurally the same as a one dimensional array of Byte.
 //                               A server shall accept a ByteString if an array of Byte is expected.
 // BadNoCommunication
+// guards against a cyclic MethodDeclarationId chain or a runaway type hierarchy
+const maxDepth = 64;
+/** true when `method` was instantiated from `declaration`, directly or through a chain of MethodDeclarationId */
+function isDeclaredBy(method, declaration) {
+    let current = method;
+    for (let i = 0; i < maxDepth; i++) {
+        const declarationId = current.methodDeclarationId;
+        if (!declarationId || sameNodeId(declarationId, current.nodeId)) {
+            return false;
+        }
+        if (sameNodeId(declarationId, declaration.nodeId)) {
+            return true;
+        }
+        const next = current.addressSpace.findNode(declarationId);
+        if (!next || next.nodeClass !== NodeClass.Method) {
+            return false;
+        }
+        current = next;
+    }
+    return false;
+}
+/**
+ * the Method whose implementation runs: the target's own, else the one named by methodId, else the first
+ * bound Method along the target's MethodDeclarationId chain (an instance created before its type's method was
+ * bound). The target itself when none is bound: execute() then reports it as not bound.
+ */
+function implementationOf(targetMethod, methodObj) {
+    if (targetMethod.isBound()) {
+        return targetMethod;
+    }
+    if (methodObj.isBound()) {
+        return methodObj;
+    }
+    let current = targetMethod;
+    for (let i = 0; i < maxDepth; i++) {
+        const declarationId = current.methodDeclarationId;
+        if (!declarationId || sameNodeId(declarationId, current.nodeId)) {
+            break;
+        }
+        const next = current.addressSpace.findNode(declarationId);
+        if (!next || next.nodeClass !== NodeClass.Method) {
+            break;
+        }
+        current = next;
+        if (current.isBound()) {
+            return current;
+        }
+    }
+    return targetMethod;
+}
+/** the ObjectType of `object` (or `object` itself when it is an ObjectType) and all its supertypes */
+function typeHierarchyOf(object) {
+    const types = [];
+    let type = object.nodeClass === NodeClass.ObjectType ? object : object.typeDefinitionObj;
+    while (type && types.length < maxDepth) {
+        types.push(type);
+        type = type.subtypeOfObj;
+    }
+    return types;
+}
+/**
+ * true when `declaringNode` is an ObjectType that defines methods for `object`: one of its types or supertypes,
+ * or an InterfaceType (or a supertype of one) that the object or one of its types implements (OPC 10000-3 v1.05.06 §4.10)
+ */
+function isTypeOf(declaringNode, object) {
+    if (!declaringNode || declaringNode.nodeClass !== NodeClass.ObjectType) {
+        return false;
+    }
+    const types = typeHierarchyOf(object);
+    if (types.includes(declaringNode)) {
+        return true;
+    }
+    if (!object.addressSpace.findReferenceType("HasInterface")) {
+        return false;
+    }
+    for (const node of [object, ...types]) {
+        for (const iface of node.findReferencesExAsObject("HasInterface", BrowseDirection.Forward)) {
+            if (iface === declaringNode ||
+                (iface.nodeClass === NodeClass.ObjectType && iface.isSubtypeOf(declaringNode))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * OPC 10000-4 v1.05.07 §5.12.2 Call, methodId: "If the objectId is the NodeId of an Object, the methodId is either the
+ * NodeId of the Method that is a component of the Object instance or the NodeId of the Method in the ObjectType
+ * that defines the Method. Independent of the methodId parameter, the RolePermissions are always verified with
+ * the Method Node that is the target of a HasComponent from the Node defined by objectId."
+ *
+ * Returns the Method whose AccessRestrictions and RolePermissions govern the call:
+ * - `methodObj` itself when it is a component of `object`;
+ * - otherwise the component of `object` instantiated from `methodObj` (MethodDeclarationId), or, when
+ *   `methodObj` belongs to a type of `object`, the component with the same BrowseName;
+ * - `methodObj` when it belongs to a type of `object` that has no such component (a method called on its
+ *   ObjectType, or an optional method not instantiated);
+ * - BadMethodInvalid when `methodObj` is neither a method of `object` nor one of its types.
+ */
+function resolveMethodOfObject(object, methodObj) {
+    if (object.getMethodById(methodObj.nodeId)) {
+        return { statusCode: StatusCodes.Good, method: methodObj };
+    }
+    const methods = object.getMethods();
+    const instantiated = methods.find((m) => isDeclaredBy(m, methodObj));
+    if (instantiated) {
+        return { statusCode: StatusCodes.Good, method: instantiated };
+    }
+    if (!isTypeOf(methodObj.parent, object)) {
+        return { statusCode: StatusCodes.BadMethodInvalid };
+    }
+    const browseName = methodObj.browseName.toString();
+    const sameName = methods.find((m) => m.browseName.toString() === browseName);
+    return { statusCode: StatusCodes.Good, method: sameName || methodObj };
+}
 export async function callMethodHelper(context, addressSpace, callMethodRequest) {
     const objectId = callMethodRequest.objectId;
     const methodId = callMethodRequest.methodId;
@@ -44,7 +160,13 @@ export async function callMethodHelper(context, addressSpace, callMethodRequest)
     if (methodObj.nodeClass !== NodeClass.Method) {
         return { statusCode: StatusCodes.BadMethodInvalid };
     }
-    const response1 = getMethodDeclaration_ArgumentList(addressSpace, objectId, methodId);
+    const resolved = resolveMethodOfObject(object, methodObj);
+    if (!resolved.method) {
+        return { statusCode: resolved.statusCode };
+    }
+    // the Method whose AccessRestrictions and RolePermissions apply, whatever methodId named
+    const targetMethod = resolved.method;
+    const response1 = getMethodDeclaration_ArgumentList(addressSpace, objectId, targetMethod.nodeId);
     if (response1.statusCode.isNotGood()) {
         return { statusCode: response1.statusCode };
     }
@@ -60,7 +182,18 @@ export async function callMethodHelper(context, addressSpace, callMethodRequest)
     }
     try {
         await resolveOpaqueOnAddressSpace(addressSpace, inputArguments);
-        const callMethodResponse = await methodObj.execute(object, inputArguments, context);
+        // execute() verifies the method it runs on; when the instance method has no implementation of its own,
+        // the declaration's runs, so the instance method is verified here first, in the same order as execute()
+        const executingMethod = implementationOf(targetMethod, methodObj);
+        if (executingMethod !== targetMethod) {
+            if (context.isAccessRestricted(targetMethod)) {
+                return { statusCode: StatusCodes.BadSecurityModeInsufficient };
+            }
+            if (!context.checkPermission(targetMethod, PermissionType.Call)) {
+                return { statusCode: StatusCodes.BadUserAccessDenied };
+            }
+        }
+        const callMethodResponse = await executingMethod.execute(object, inputArguments, context);
         callMethodResponse.inputArgumentResults = callMethodResponse.inputArgumentResults || response.inputArgumentResults || [];
         assert(callMethodResponse.statusCode);
         if (callMethodResponse.statusCode?.isGood()) {

package/dist/api/helpers/call_helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../api/helpers/call_helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../api/helpers/call_helpers.ts"],"names":[],"mappings":"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"}

package/dist/api/loader/nodeset_record.d.ts

@@ -28,7 +28,7 @@ import type { EnumFieldOptions, StructureFieldOptions } from "node-opcua-xml2jso
  * was built from, and nothing else would ever invalidate it. The source digest cannot: the source
  * did not change. This number is the only lever.
  */
-export declare const NODESET_RECORD_SCHEMA = 5;
+export declare const NODESET_RECORD_SCHEMA = 6;
 export interface NodesetModelRecord {
     modelUri: string;
     version: string;

package/dist/api/loader/nodeset_record.js

@@ -8,7 +8,7 @@
  * was built from, and nothing else would ever invalidate it. The source digest cannot: the source
  * did not change. This number is the only lever.
  */
-export const NODESET_RECORD_SCHEMA = 5;
+export const NODESET_RECORD_SCHEMA = 6;
 /**
  * an extension object the reader could not decode on the spot: its XML body waits in the value
  * until the data types are known, then a consumer decodes it

package/dist/api/loader/nodeset_record_applier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeset_record_applier.d.ts","sourceRoot":"","sources":["../../../api/loader/nodeset_record_applier.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAER,QAAQ,EAER,aAAa,EAEb,WAAW,EAGd,MAAM,+BAA+B,CAAC;AAevC,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAQ1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,EAIH,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAE7B,MAAM,qBAAqB,CAAC;AAO7B,MAAM,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC7B,SAAS,EAAE,IAAI,EAAE,CAAC;IAClB,6BAA6B,EAAE,IAAI,EAAE,CAAC;IACtC,2BAA2B,EAAE,IAAI,EAAE,CAAC;IACpC,6BAA6B,EAAE,IAAI,EAAE,CAAC;IACtC,6CAA6C,EAAE,IAAI,EAAE,CAAC;IACtD,2BAA2B,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3E;AACD,wBAAgB,oBAAoB,IAAI,gBAAgB,CASvD;AA2ID,yDAAyD;AACzD,MAAM,WAAW,qBAAqB;IAClC,mGAAmG;IACnG,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvB,2DAA2D;IAC3D,UAAU,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;CAC9C;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAiB1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAjB3B,+GAA+G;IAC/G,OAAO,CAAC,OAAO,CAAiE;IAEhF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAU;IAC/C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAU;IAGlD,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,UAAU,CAAS;IAE3B,YACI,YAAY,EAAE,aAAa,EACV,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EAQ5C;IAEM,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CASxC;IAGD,OAAO,CAAC,WAAW;IAoDnB,OAAO,CAAC,YAAY;IAoEpB,OAAO,CAAC,uBAAuB;IAU/B,yEAAyE;IACzE,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,eAAe;IAGvB,OAAO,CAAC,sBAAsB;IAI9B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAiB9B;IAEF;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,MAAM;IAYd,sGAAsG;IACtG,OAAO,CAAC,UAAU;IAWlB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM;IAiBd;;;;;OAKG;IACI,yBAAyB,IAAI,qBAAqB,CAIxD;IAED,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,SAAS;IAoFjB,OAAO,CAAC,aAAa;IAwCrB;;;OAGG;IACH,OAAO,CAAC,YAAY;IA4CpB,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,aAAa;IAsErB,oGAAoG;IACpG,OAAO,CAAC,eAAe;IAYvB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4B1B,OAAO,CAAC,iBAAiB;CAkB5B"}
+{"version":3,"file":"nodeset_record_applier.d.ts","sourceRoot":"","sources":["../../../api/loader/nodeset_record_applier.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAER,QAAQ,EAER,aAAa,EAEb,WAAW,EAGd,MAAM,+BAA+B,CAAC;AAevC,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAQ1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,EAIH,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAE7B,MAAM,qBAAqB,CAAC;AAO7B,MAAM,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC7B,SAAS,EAAE,IAAI,EAAE,CAAC;IAClB,6BAA6B,EAAE,IAAI,EAAE,CAAC;IACtC,2BAA2B,EAAE,IAAI,EAAE,CAAC;IACpC,6BAA6B,EAAE,IAAI,EAAE,CAAC;IACtC,6CAA6C,EAAE,IAAI,EAAE,CAAC;IACtD,2BAA2B,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3E;AACD,wBAAgB,oBAAoB,IAAI,gBAAgB,CASvD;AA2ID,yDAAyD;AACzD,MAAM,WAAW,qBAAqB;IAClC,mGAAmG;IACnG,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvB,2DAA2D;IAC3D,UAAU,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;CAC9C;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAiB1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAjB3B,+GAA+G;IAC/G,OAAO,CAAC,OAAO,CAAiE;IAEhF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAU;IAC/C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAU;IAGlD,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,UAAU,CAAS;IAE3B,YACI,YAAY,EAAE,aAAa,EACV,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EAQ5C;IAEM,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CASxC;IAGD,OAAO,CAAC,WAAW;IAoDnB,OAAO,CAAC,YAAY;IAoEpB,OAAO,CAAC,uBAAuB;IAU/B,yEAAyE;IACzE,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,eAAe;IAGvB,OAAO,CAAC,sBAAsB;IAI9B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAiB9B;IAEF;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,MAAM;IAcd,sGAAsG;IACtG,OAAO,CAAC,UAAU;IAWlB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM;IAiBd;;;;;OAKG;IACI,yBAAyB,IAAI,qBAAqB,CAIxD;IAED,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,SAAS;IAqFjB,OAAO,CAAC,aAAa;IAwCrB;;;OAGG;IACH,OAAO,CAAC,YAAY;IA4CpB,OAAO,CAAC,0BAA0B;IAsBlC,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,aAAa;IAsErB,oGAAoG;IACpG,OAAO,CAAC,eAAe;IAYvB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4B1B,OAAO,CAAC,iBAAiB;CAkB5B"}

package/dist/api/loader/nodeset_record_applier.js

@@ -400,6 +400,8 @@ export class NodesetRecordApplier {
             references: this.references(record),
             // documentation, not behaviour, but the document said it and it must survive the trip
             releaseStatus: record.releaseStatus,
+            nodesetDocumentation: record.documentation,
+            nodesetCategory: record.category,
             ...this.permissions(record)
         };
     }
@@ -493,6 +495,7 @@ export class NodesetRecordApplier {
                 const params = {
                     ...this.common(record),
                     isAbstract: record.isAbstract,
+                    symmetric: !!record.symmetric,
                     displayName: record.displayName,
                     description: record.description,
                     inverseName: record.inverseName