node-opcua-address-space-base 2.105.0 → 2.107.0

package/dist/base_node.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
 export type Duration = number;
-import { AccessRestrictionsFlag, AttributeIds, BrowseDirection, LocalizedText, NodeClass, QualifiedName, QualifiedNameLike, QualifiedNameOptions } from "node-opcua-data-model";
+import { AccessRestrictionsFlag, AttributeIds, BrowseDirection, LocalizedText, LocalizedTextLike, NodeClass, QualifiedName, QualifiedNameLike, QualifiedNameOptions } from "node-opcua-data-model";
 import { DataType } from "node-opcua-variant";
 import { DataValue } from "node-opcua-data-value";
 import { NodeId, NodeIdLike } from "node-opcua-nodeid";
@@ -184,4 +184,5 @@ export declare class BaseNode extends EventEmitter {
      *
      */
     getAggregates(): BaseNode[];
+    setDescription(description: LocalizedTextLike): void;
 }

package/dist/bind_variable.d.ts

@@ -10,7 +10,7 @@ export type VariableSetterVariation1 = (this: UAVariable, value: Variant) => Sta
 export type VariableSetterVariation2 = (this: UAVariable, value: Variant, callback: CallbackT<StatusCode>) => void;
 export type VariableSetter = VariableSetterVariation1 | VariableSetterVariation2;
 export type HistoryReadFunc = (context: ISessionContext, historyReadDetails: ReadRawModifiedDetails | ReadEventDetails | ReadProcessedDetails | ReadAtTimeDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>) => void;
-export type GetFunc = (this: UAVariable) => Variant;
+export type GetFunc = (this: UAVariable) => Variant | StatusCode;
 export type SetFunc = VariableSetter | null;
 export type VariableDataValueGetterSync = (this: UAVariable) => DataValue;
 export type VariableDataValueGetterPromise = (this: UAVariable) => Promise<DataValue>;

package/dist/clone_helper.d.ts

@@ -3,12 +3,38 @@ import { UAVariable } from "./ua_variable";
 import { UAMethod } from "./ua_method";
 import { UAObjectType } from "./ua_object_type";
 import { UAVariableType } from "./ua_variable_type";
+import { BaseNode } from "./base_node";
+/** @private */
+export declare function fullPath(node: BaseNode): string;
+/** @private */
+export declare function fullPath2(node: BaseNode): string;
+/** @private */
+export declare function exploreNode(node: BaseNode): void;
+interface CloneInfo {
+    cloned: UAObject | UAVariable | UAMethod;
+    original: UAObject | UAVariable | UAMethod | UAVariableType | UAObjectType;
+}
 export declare class CloneHelper {
     level: number;
-    private readonly mapOrgToClone;
+    private _context;
+    private _contextStack;
+    private readonly mapTypeInstanceChildren;
     pad(): string;
-    registerClonedObject<TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType, TC extends UAObject | UAVariable | UAMethod>(clonedNode: TC, originalNode: TO): void;
-    getCloned(originalNode: UAVariableType | UAObjectType): UAObject | UAVariable | UAMethod | null;
+    getClonedArray(): CloneInfo[];
+    pushContext<TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType, TC extends UAObject | UAVariable | UAMethod>({ clonedParent, originalParent }: {
+        clonedParent: TC;
+        originalParent: TO;
+    }): void;
+    popContext(): void;
+    registerClonedObject<TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType, TC extends UAObject | UAVariable | UAMethod>({ clonedNode, originalNode }: {
+        clonedNode: TC;
+        originalNode: TO;
+    }): void;
+    getCloned({ originalParent, clonedParent, originalNode }: {
+        originalParent: BaseNode;
+        clonedParent: BaseNode;
+        originalNode: UAVariable | UAObject;
+    }): UAObject | UAVariable | UAMethod | null;
 }
 export declare function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): void;
 /**
@@ -18,3 +44,4 @@ export declare function reconstructNonHierarchicalReferences(extraInfo: CloneHel
  * @param baseType
  */
 export declare function reconstructFunctionalGroupType(extraInfo: CloneHelper): void;
+export {};

package/dist/clone_helper.js

@@ -1,14 +1,70 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reconstructFunctionalGroupType = exports.reconstructNonHierarchicalReferences = exports.CloneHelper = void 0;
+exports.reconstructFunctionalGroupType = exports.reconstructNonHierarchicalReferences = exports.CloneHelper = exports.exploreNode = exports.fullPath2 = exports.fullPath = void 0;
 const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
 const node_opcua_nodeid_1 = require("node-opcua-nodeid");
 const node_opcua_constants_1 = require("node-opcua-constants");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("CLONE");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("CLONE");
+const chalk_1 = __importDefault(require("chalk"));
 const warningLog = (0, node_opcua_debug_1.make_warningLog)("CLONE");
+const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
+const doTrace = (0, node_opcua_debug_1.checkDebugFlag)("INSTANTIATE");
+const traceLog = errorLog;
+// istanbul ignore next
+/** @private */
+function fullPath(node) {
+    const browseName = node.browseName.toString();
+    const parent = node.findReferencesExAsObject("Aggregates", node_opcua_data_model_1.BrowseDirection.Inverse)[0];
+    if (parent) {
+        return fullPath(parent) + "/" + browseName;
+    }
+    const containingFolder = node.findReferencesExAsObject("Organizes", node_opcua_data_model_1.BrowseDirection.Inverse)[0];
+    if (containingFolder) {
+        return fullPath(containingFolder) + "@" + browseName;
+    }
+    return browseName;
+}
+exports.fullPath = fullPath;
+// istanbul ignore next
+/** @private */
+function fullPath2(node) {
+    return fullPath(node) + " (" + node.nodeId.toString() + ")";
+}
+exports.fullPath2 = fullPath2;
+// istanbul ignore next
+/** @private */
+function exploreNode(node) {
+    const f = (n) => {
+        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? " - " + n.modellingRule : ""}`;
+    };
+    const r = (r) => {
+        const ref = node.addressSpace.findNode(r);
+        if (!ref)
+            return `${r.nodeId.toString()} (unknown)`;
+        return (ref === null || ref === void 0 ? void 0 : ref.browseName.toString()) + " " + ref.nodeId.toString();
+    };
+    const map = new Set();
+    const _explore = (node, pad) => {
+        const a = node.findReferencesEx("Aggregates", node_opcua_data_model_1.BrowseDirection.Forward);
+        const b = node.findReferencesEx("Organizes", node_opcua_data_model_1.BrowseDirection.Forward);
+        for (const ref of [...a, ...b]) {
+            const alreadyVisited = map.has(ref.nodeId.toString());
+            traceLog(pad, "  +-- ", r(ref.referenceType).padEnd(20), "-->", f(ref.node).padEnd(10), alreadyVisited ? " (already visited)" : "");
+            if (alreadyVisited) {
+                continue;
+            }
+            map.add(ref.nodeId.toString());
+            _explore(ref.node, pad + "   ");
+        }
+    };
+    traceLog("exploring ", f(node));
+    _explore(node, "   ");
+}
+exports.exploreNode = exploreNode;
 //
 //  case 1:
 //   /-----------------------------\
@@ -32,7 +88,7 @@ const warningLog = (0, node_opcua_debug_1.make_warningLog)("CLONE");
 //   \-----------------------------/
 //              ^        |
 //              |        |       +----------+
-//              |        +-------| Folder1  |
+//              |        +-------| Folder1  |
 //              |                +----------+
 //              |                     |
 //              |                     +--------------|- (EnabledState)   (shadow element)
@@ -42,7 +98,7 @@ const warningLog = (0, node_opcua_debug_1.make_warningLog)("CLONE");
 //   \-----------------------------/
 //              |
 //              |        |       +----------+
-//              |        +-------| Folder1  |
+//              |        +-------| Folder1  |
 //              |                +----------+
 //              |                     |
 //              |                     +--------------|- (EnabledState)
@@ -92,37 +148,94 @@ function followPath(node, path) {
 class CloneHelper {
     constructor() {
         this.level = 0;
-        this.mapOrgToClone = new Map();
+        this._context = null;
+        this._contextStack = [];
+        this.mapTypeInstanceChildren = new Map();
     }
     pad() {
         return " ".padEnd(this.level * 2, " ");
     }
-    registerClonedObject(clonedNode, originalNode) {
-        this.mapOrgToClone.set(originalNode.nodeId.toString(), {
-            cloned: clonedNode,
-            original: originalNode
-        });
-        //
-        const { parentType, path } = _get_parent_type_and_path(originalNode);
-        if (parentType) {
-            let base = parentType.subtypeOfObj;
-            while (base) {
-                const shadowChild = followPath(base, path);
-                if (shadowChild) {
-                    this.mapOrgToClone.set(shadowChild.nodeId.toString(), {
-                        cloned: clonedNode,
-                        original: shadowChild
-                    });
-                }
-                base = base.subtypeOfObj;
+    getClonedArray() {
+        const result = [];
+        for (const map of this.mapTypeInstanceChildren.values()) {
+            for (const cloneInfo of map.values()) {
+                result.push(cloneInfo);
             }
         }
-        else {
+        return result;
+    }
+    pushContext({ clonedParent, originalParent }) {
+        // istanbul ignore next
+        doTrace &&
+            traceLog(chalk_1.default.yellow("push context: "), "original parent = ", fullPath2(originalParent), "cloned parent =", fullPath2(clonedParent));
+        const typeInstance = originalParent.nodeId.toString() + clonedParent.nodeId.toString();
+        // istanbul ignore next
+        doTrace && traceLog("typeInstance (1) = ", typeInstance, fullPath2(originalParent), fullPath2(clonedParent));
+        let a = this.mapTypeInstanceChildren.get(typeInstance);
+        if (a) {
+            throw new Error("Internal Error");
+        }
+        a = new Map();
+        this.mapTypeInstanceChildren.set(typeInstance, a);
+        if (this._context) {
+            this._contextStack.push(this._context);
+        }
+        this._context = a;
+    }
+    popContext() {
+        (0, node_opcua_assert_1.assert)(this._contextStack.length > 0);
+        this._context = this._contextStack.pop();
+    }
+    registerClonedObject({ clonedNode, originalNode }) {
+        if (!this._context) {
+            this.pushContext({ clonedParent: clonedNode, originalParent: originalNode });
         }
+        // istanbul ignore next
+        doTrace &&
+            traceLog(chalk_1.default.yellow("registerClonedObject"), "originalNode = ", fullPath2(originalNode), "clonedNode =", fullPath2(clonedNode));
+        const insertShadow = (map) => {
+            const { parentType, path } = _get_parent_type_and_path(originalNode);
+            if (parentType) {
+                let base = parentType.subtypeOfObj;
+                while (base) {
+                    const shadowChild = followPath(base, path);
+                    if (shadowChild) {
+                        // istanbul ignore next
+                        doTrace && traceLog("shadowChild = ", fullPath2(shadowChild));
+                        map.set(shadowChild.nodeId.toString(), {
+                            cloned: clonedNode,
+                            original: shadowChild
+                        });
+                    }
+                    base = base.subtypeOfObj;
+                }
+            }
+        };
         // find subTypeOf
+        if (!this._context) {
+            throw new Error("internal error: Cannot find context");
+        }
+        // also create  [Type+Instance] map
+        // to do so we need to find the TypeDefinition of the originalNode
+        this._context.set(originalNode.nodeId.toString(), {
+            cloned: clonedNode,
+            original: originalNode
+        });
+        insertShadow(this._context);
     }
-    getCloned(originalNode) {
-        const info = this.mapOrgToClone.get(originalNode.nodeId.toString());
+    getCloned({ originalParent, clonedParent, originalNode }) {
+        //
+        //  Type                                                 Instance
+        //    +-> Folder (A)                                         +-> Folder (A')
+        //    |      |                                               |     |
+        //    |      +- Component (B)                                |     +- Component (B')
+        //    °-> Folder (C)       [parentNode]                      +-> Folder (C')          <= [clonedParent]
+        //          |                                                      |
+        //          +- Component (B again !)  [originalNode]               +- Component (B again !)
+        // istanbul ignore next
+        doTrace &&
+            traceLog("typeInstance (3) = originalParent", fullPath2(originalParent), "originalNode=", fullPath2(originalNode), "clonedParent", fullPath2(clonedParent));
+        const info = this._context.get(originalNode.nodeId.toString());
         if (info) {
             return info.cloned;
         }
@@ -166,13 +279,21 @@ function findNonHierarchicalReferences(originalObject) {
     references = _remove_unwanted_ref(references);
     return references;
 }
+const findImplementedObject = (cloneInfoArray, ref) => {
+    const a = cloneInfoArray.filter((x) => x.original.nodeId.toString() === ref.nodeId.toString());
+    if (a.length === 0)
+        return null;
+    const info = a[0];
+    return info;
+};
 function reconstructNonHierarchicalReferences(extraInfo) {
-    const extraInfo_ = extraInfo;
-    const findImplementedObject = (ref) => extraInfo_.mapOrgToClone.get(ref.nodeId.toString()) || null;
+    const cloneInfoArray = extraInfo.getClonedArray();
     // navigate through original objects to find those that are being references by node that
     // have been cloned .
     // this could be node organized by some FunctionalGroup
-    for (const { original, cloned } of extraInfo_.mapOrgToClone.values()) {
+    // istanbul ignore next
+    doTrace && traceLog(chalk_1.default.yellow("reconstructNonHierarchicalReferences"));
+    for (const { original, cloned } of cloneInfoArray) {
         apply(original, cloned);
     }
     function apply(original, cloned) {
@@ -183,34 +304,23 @@ function reconstructNonHierarchicalReferences(extraInfo) {
             return;
         }
         // istanbul ignore next
-        if (doDebug) {
-            debugLog(" investigation ", original.browseName.toString(), cloned.nodeClass.toString(), original.nodeClass.toString(), original.nodeId.toString(), cloned.nodeId.toString());
-        }
+        doTrace && traceLog(" investigation ", "original", fullPath2(original), node_opcua_data_model_1.NodeClass[cloned.nodeClass], fullPath2(cloned));
         for (const ref of originalNonHierarchical) {
-            const info = findImplementedObject(ref);
+            const info = findImplementedObject(cloneInfoArray, ref);
+            if (!info)
+                continue;
             // if the object pointed by this reference is also cloned ...
-            if (info) {
-                const originalDest = info.original;
-                const cloneDest = info.cloned;
-                // istanbul ignore next
-                if (doDebug) {
-                    debugLog("   adding reference ", ref.referenceType, addressSpace.findNode(ref.referenceType).browseName.toString(), " from cloned ", cloned.nodeId.toString(), cloned.browseName.toString(), " to cloned ", cloneDest.nodeId.toString(), cloneDest.browseName.toString());
-                }
-                // restore reference
-                cloned.addReference({
-                    isForward: false,
-                    nodeId: cloneDest.nodeId,
-                    referenceType: ref.referenceType
-                });
-            }
-            else {
-                //     // restore reference
-                //     cloned.addReference({
-                //         isForward: false,
-                //         nodeId: ref.nodeId,
-                //         referenceType: ref.referenceType
-                //     });
-            }
+            const originalDest = info.original;
+            const cloneDest = info.cloned;
+            // istanbul ignore next
+            doTrace &&
+                traceLog("   adding reference ", fullPath2(addressSpace.findNode(ref.referenceType)), " from cloned ", fullPath2(cloned), " to cloned ", fullPath2(cloneDest));
+            // restore reference
+            cloned.addReference({
+                isForward: false,
+                nodeId: cloneDest.nodeId,
+                referenceType: ref.referenceType
+            });
         }
     }
 }
@@ -234,12 +344,12 @@ exports.reconstructNonHierarchicalReferences = reconstructNonHierarchicalReferen
  *                                +-------- Organizes---+
  */
 function reconstructFunctionalGroupType(extraInfo) {
-    const extraInfo_ = extraInfo;
+    const cloneInfoArray = extraInfo.getClonedArray();
     // navigate through original objects to find those that are being organized by some FunctionalGroup
-    for (const { original, cloned } of extraInfo_.mapOrgToClone.values()) {
+    for (const { original, cloned } of cloneInfoArray) {
         const organizedByArray = original.findReferencesEx("Organizes", node_opcua_data_model_1.BrowseDirection.Inverse);
         for (const ref of organizedByArray) {
-            const info = extraInfo_.mapOrgToClone.get(ref.nodeId.toString());
+            const info = findImplementedObject(cloneInfoArray, ref);
             if (!info)
                 continue;
             const folder = info.original;

package/dist/clone_helper.js.map

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

package/dist/clone_options.d.ts

@@ -16,10 +16,22 @@ export declare const defaultCloneFilter: CloneFilter;
 export interface CloneExtraInfo {
     level: number;
     pad(): string;
-    registerClonedObject(clonedNode: BaseNode, originalNode: BaseNode): void;
-    getCloned(originalObject: BaseNode): BaseNode | null;
+    pushContext(params: {
+        clonedParent: BaseNode;
+        originalParent: BaseNode;
+    }): void;
+    popContext(): void;
+    registerClonedObject(params: {
+        clonedNode: BaseNode;
+        originalNode: BaseNode;
+    }): void;
+    getCloned(params: {
+        originalParent: BaseNode;
+        clonedParent: BaseNode;
+        originalNode: UAVariable | UAObject | UAMethod;
+    }): BaseNode | null;
 }
-export declare const makeDefaultCloneExtraInfo: () => CloneExtraInfo;
+export declare const makeDefaultCloneExtraInfo: (node: UAVariable | UAMethod | UAObject) => CloneExtraInfo;
 export interface CloneOptions {
     namespace: INamespace;
     references?: UAReference[];

package/dist/clone_options.js

@@ -3,11 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDefaultCloneExtraInfo = exports.defaultCloneFilter = void 0;
 const clone_helper_1 = require("./clone_helper");
 exports.defaultCloneFilter = {
-    shouldKeep: () => true,
+    shouldKeep: (node) => {
+        if (node.modellingRule === "OptionalPlaceholder" || node.modellingRule === "MandatoryPlaceholder") {
+            return false;
+        }
+        return true;
+    },
     filterFor(node) {
         return this;
     }
 };
-const makeDefaultCloneExtraInfo = () => new clone_helper_1.CloneHelper();
+const makeDefaultCloneExtraInfo = (node) => {
+    const extraInfo = new clone_helper_1.CloneHelper();
+    extraInfo.pushContext({ originalParent: node, clonedParent: node });
+    return extraInfo;
+};
 exports.makeDefaultCloneExtraInfo = makeDefaultCloneExtraInfo;
 //# sourceMappingURL=clone_options.js.map

package/dist/clone_options.js.map

@@ -1 +1 @@
-{"version":3,"file":"clone_options.js","sourceRoot":"","sources":["../source/clone_options.ts"],"names":[],"mappings":";;;AAWA,iDAA6C;AAMhC,QAAA,kBAAkB,GAAgB;IAC3C,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;IACtB,SAAS,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAC;AAUK,MAAM,yBAAyB,GAAG,GAAmB,EAAE,CAAG,IAAI,0BAAW,EAAE,CAAC;AAAtE,QAAA,yBAAyB,6BAA6C"}
+{"version":3,"file":"clone_options.js","sourceRoot":"","sources":["../source/clone_options.ts"],"names":[],"mappings":";;;AAWA,iDAA6C;AAMhC,QAAA,kBAAkB,GAAgB;IAC3C,UAAU,EAAE,CAAC,IAAc,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,aAAa,KAAK,qBAAqB,IAAI,IAAI,CAAC,aAAa,KAAK,sBAAsB,EAAE;YAC/F,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,SAAS,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAC;AAkBK,MAAM,yBAAyB,GAAG,CAAC,IAAsC,EAAkB,EAAE;IAChG,MAAM,SAAS,GAAG,IAAI,0BAAW,EAAE,CAAC;IACpC,SAAS,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAJW,QAAA,yBAAyB,6BAIpC"}

package/dist/session_context.d.ts

@@ -24,7 +24,7 @@ export interface IContinuationPointInfo<T> {
     statusCode: StatusCode;
 }
 export interface ContinuationData {
-    continuationPoint: ContinuationPoint | null;
+    continuationPoint?: ContinuationPoint | null;
     releaseContinuationPoints?: boolean;
     index?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space-base",
-    "version": "2.105.0",
+    "version": "2.107.0",
     "description": "pure nodejs OPCUA SDK - module address-space-base",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -27,9 +27,9 @@
         "node-opcua-extension-object": "2.105.0",
         "node-opcua-nodeid": "2.105.0",
         "node-opcua-numeric-range": "2.105.0",
-        "node-opcua-schemas": "2.105.0",
+        "node-opcua-schemas": "2.107.0",
         "node-opcua-status-code": "2.105.0",
-        "node-opcua-types": "2.105.0",
+        "node-opcua-types": "2.107.0",
         "node-opcua-variant": "2.105.0"
     },
     "author": "Etienne Rossignon",
@@ -47,7 +47,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "41c30f321debfe92128905d97a52426b9d7f9b9e",
+    "gitHead": "df5c9168eea0d1a521603d181fa66ace7649e79e",
     "files": [
         "dist",
         "source"

package/source/base_node.ts

@@ -7,6 +7,7 @@ import {
     AttributeIds,
     BrowseDirection,
     LocalizedText,
+    LocalizedTextLike,
     NodeClass,
     QualifiedName,
     QualifiedNameLike,
@@ -254,4 +255,6 @@ export declare class BaseNode extends EventEmitter {
      *
      */
     getAggregates(): BaseNode[];
+
+    setDescription(description: LocalizedTextLike): void;
 }

package/source/bind_variable.ts

@@ -29,7 +29,7 @@ export type HistoryReadFunc = (
     callback: CallbackT<HistoryReadResult>
 ) => void;
 
-export type GetFunc = (this: UAVariable) => Variant;
+export type GetFunc = (this: UAVariable) => Variant | StatusCode;
 export type SetFunc = VariableSetter | null;
 
 export type VariableDataValueGetterSync = (this: UAVariable) => DataValue;

package/source/clone_helper.ts

@@ -1,23 +1,85 @@
 import { assert } from "node-opcua-assert";
-import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
+import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { BrowseDirection, NodeClass, QualifiedName } from "node-opcua-data-model";
+import { makeNodeId, sameNodeId } from "node-opcua-nodeid";
+import { ReferenceTypeIds } from "node-opcua-constants";
+
+import chalk from "chalk";
+
 import { UAObject } from "./ua_object";
 import { UAVariable } from "./ua_variable";
 import { UAMethod } from "./ua_method";
 import { UAObjectType } from "./ua_object_type";
 import { UAVariableType } from "./ua_variable_type";
 import { BaseNode } from "./base_node";
-import { makeNodeId, sameNodeId } from "node-opcua-nodeid";
-import { ReferenceTypeIds } from "node-opcua-constants";
 import { UAReference } from "./ua_reference";
 import { IAddressSpace } from "./address_space";
 
-const debugLog = make_debugLog("CLONE");
-const doDebug = checkDebugFlag("CLONE");
 const warningLog = make_warningLog("CLONE");
 
+const errorLog = make_errorLog(__filename);
+const doTrace = checkDebugFlag("INSTANTIATE");
+const traceLog = errorLog;
+
 type UAConcrete = UAVariable | UAObject | UAMethod;
 
+// istanbul ignore next
+/** @private */
+export function fullPath(node: BaseNode): string {
+    const browseName = node.browseName.toString();
+
+    const parent = node.findReferencesExAsObject("Aggregates", BrowseDirection.Inverse)[0];
+    if (parent) {
+        return fullPath(parent) + "/" + browseName;
+    }
+    const containingFolder = node.findReferencesExAsObject("Organizes", BrowseDirection.Inverse)[0];
+    if (containingFolder) {
+        return fullPath(containingFolder) + "@" + browseName;
+    }
+    return browseName;
+}
+// istanbul ignore next
+/** @private */
+export function fullPath2(node: BaseNode): string {
+    return fullPath(node) + " (" + node.nodeId.toString() + ")";
+}
+
+// istanbul ignore next
+/** @private */
+export function exploreNode(node: BaseNode) {
+    const f = (n: BaseNode) => {
+        return `${n.browseName.toString()} (${n.nodeId.toString()})${n.modellingRule ? " - " + n.modellingRule : ""}`;
+    };
+    const r = (r: any) => {
+        const ref = node.addressSpace.findNode(r);
+        if (!ref) return `${r.nodeId.toString()} (unknown)`;
+        return ref?.browseName.toString() + " " + ref!.nodeId.toString();
+    };
+    const map = new Set();
+    const _explore = (node: BaseNode, pad: string) => {
+        const a = node.findReferencesEx("Aggregates", BrowseDirection.Forward);
+        const b = node.findReferencesEx("Organizes", BrowseDirection.Forward);
+
+        for (const ref of [...a, ...b]) {
+            const alreadyVisited = map.has(ref.nodeId.toString());
+            traceLog(
+                pad,
+                "  +-- ",
+                r(ref.referenceType).padEnd(20),
+                "-->",
+                f(ref.node!).padEnd(10),
+                alreadyVisited ? " (already visited)" : ""
+            );
+            if (alreadyVisited) {
+                continue;
+            }
+            map.add(ref.nodeId.toString());
+            _explore(ref.node!, pad + "   ");
+        }
+    };
+    traceLog("exploring ", f(node));
+    _explore(node, "   ");
+}
 //
 //  case 1:
 //   /-----------------------------\
@@ -42,7 +104,7 @@ type UAConcrete = UAVariable | UAObject | UAMethod;
 //   \-----------------------------/
 //              ^        |
 //              |        |       +----------+
-//              |        +-------| Folder1  |
+//              |        +-------| Folder1  |
 //              |                +----------+
 //              |                     |
 //              |                     +--------------|- (EnabledState)   (shadow element)
@@ -52,7 +114,7 @@ type UAConcrete = UAVariable | UAObject | UAMethod;
 //   \-----------------------------/
 //              |
 //              |        |       +----------+
-//              |        +-------| Folder1  |
+//              |        +-------| Folder1  |
 //              |                +----------+
 //              |                     |
 //              |                     +--------------|- (EnabledState)
@@ -113,43 +175,141 @@ function followPath(node: BaseNode, path: QualifiedName[]): UAConcrete | null {
     return current as UAConcrete;
 }
 
+type Context = Map<string, CloneInfo>;
+
 export class CloneHelper {
     public level = 0;
-    private readonly mapOrgToClone: Map<string, CloneInfo> = new Map();
-
+    private _context: Context | null = null;
+    private _contextStack: Context[] = [];
+    private readonly mapTypeInstanceChildren: Map<string, Map<string, CloneInfo>> = new Map();
     public pad(): string {
         return " ".padEnd(this.level * 2, " ");
     }
+
+    public getClonedArray() {
+        const result: CloneInfo[] = [];
+        for (const map of this.mapTypeInstanceChildren.values()) {
+            for (const cloneInfo of map.values()) {
+                result.push(cloneInfo);
+            }
+        }
+        return result;
+    }
+
+    public pushContext<
+        TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
+        TC extends UAObject | UAVariable | UAMethod
+    >({ clonedParent, originalParent }: { clonedParent: TC; originalParent: TO }): void {
+        // istanbul ignore next
+        doTrace &&
+            traceLog(
+                chalk.yellow("push context: "),
+                "original parent = ",
+                fullPath2(originalParent),
+                "cloned parent =",
+                fullPath2(clonedParent)
+            );
+
+        const typeInstance = originalParent.nodeId.toString() + clonedParent.nodeId.toString();
+
+        // istanbul ignore next
+        doTrace && traceLog("typeInstance (1) = ", typeInstance, fullPath2(originalParent), fullPath2(clonedParent));
+
+        let a = this.mapTypeInstanceChildren.get(typeInstance);
+        if (a) {
+            throw new Error("Internal Error");
+        }
+        a = new Map<string, CloneInfo>();
+        this.mapTypeInstanceChildren.set(typeInstance, a);
+
+        if (this._context) {
+            this._contextStack.push(this._context);
+        }
+        this._context = a;
+    }
+    public popContext() {
+        assert(this._contextStack.length > 0);
+        this._context = this._contextStack.pop()!;
+    }
     public registerClonedObject<
         TO extends UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
         TC extends UAObject | UAVariable | UAMethod
-    >(clonedNode: TC, originalNode: TO) {
-        this.mapOrgToClone.set(originalNode.nodeId.toString(), {
-            cloned: clonedNode,
-            original: originalNode
-        });
+    >({ clonedNode, originalNode }: { clonedNode: TC; originalNode: TO }): void {
+        if (!this._context) {
+            this.pushContext({ clonedParent: clonedNode, originalParent: originalNode });
+        }
+        // istanbul ignore next
+        doTrace &&
+            traceLog(
+                chalk.yellow("registerClonedObject"),
+                "originalNode = ",
+                fullPath2(originalNode),
+                "clonedNode =",
+                fullPath2(clonedNode)
+            );
 
-        //
-        const { parentType, path } = _get_parent_type_and_path(originalNode);
-
-        if (parentType) {
-            let base = parentType.subtypeOfObj;
-            while (base) {
-                const shadowChild = followPath(base, path);
-                if (shadowChild) {
-                    this.mapOrgToClone.set(shadowChild.nodeId.toString(), {
-                        cloned: clonedNode,
-                        original: shadowChild
-                    });
+        const insertShadow = (map: Map<string, CloneInfo>) => {
+            const { parentType, path } = _get_parent_type_and_path(originalNode);
+
+            if (parentType) {
+                let base = parentType.subtypeOfObj;
+                while (base) {
+                    const shadowChild = followPath(base, path);
+                    if (shadowChild) {
+                        // istanbul ignore next
+                        doTrace && traceLog("shadowChild = ", fullPath2(shadowChild));
+                        map.set(shadowChild.nodeId.toString(), {
+                            cloned: clonedNode,
+                            original: shadowChild
+                        });
+                    }
+                    base = base.subtypeOfObj;
                 }
-                base = base.subtypeOfObj;
             }
-        } else {
-        }
+        };
         // find subTypeOf
+
+        if (!this._context) {
+            throw new Error("internal error: Cannot find context");
+        }
+        // also create  [Type+Instance] map
+        // to do so we need to find the TypeDefinition of the originalNode
+        this._context.set(originalNode.nodeId.toString(), {
+            cloned: clonedNode,
+            original: originalNode
+        });
+        insertShadow(this._context);
     }
-    public getCloned(originalNode: UAVariableType | UAObjectType): UAObject | UAVariable | UAMethod | null {
-        const info = this.mapOrgToClone.get(originalNode.nodeId.toString());
+    public getCloned({
+        originalParent,
+        clonedParent,
+        originalNode
+    }: {
+        originalParent: BaseNode;
+        clonedParent: BaseNode;
+        originalNode: UAVariable | UAObject;
+    }): UAObject | UAVariable | UAMethod | null {
+        //
+        //  Type                                                 Instance
+        //    +-> Folder (A)                                         +-> Folder (A')
+        //    |      |                                               |     |
+        //    |      +- Component (B)                                |     +- Component (B')
+        //    °-> Folder (C)       [parentNode]                      +-> Folder (C')          <= [clonedParent]
+        //          |                                                      |
+        //          +- Component (B again !)  [originalNode]               +- Component (B again !)
+
+        // istanbul ignore next
+        doTrace &&
+            traceLog(
+                "typeInstance (3) = originalParent",
+                fullPath2(originalParent),
+                "originalNode=",
+                fullPath2(originalNode),
+                "clonedParent",
+                fullPath2(clonedParent)
+            );
+
+        const info = this._context!.get(originalNode.nodeId.toString());
         if (info) {
             return info.cloned;
         }
@@ -208,19 +368,27 @@ function findNonHierarchicalReferences(originalObject: BaseNode): UAReference[]
     return references;
 }
 
-export function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): void {
-    const extraInfo_ = extraInfo as unknown as { mapOrgToClone: Map<string, CloneInfo> };
+const findImplementedObject = (cloneInfoArray: CloneInfo[], ref: UAReference): CloneInfo | null => {
+    const a = cloneInfoArray.filter((x) => x.original.nodeId.toString() === ref.nodeId.toString());
+    if (a.length === 0) return null;
+    const info = a[0];
+    return info;
+};
 
-    const findImplementedObject = (ref: UAReference): CloneInfo | null =>
-        extraInfo_.mapOrgToClone.get(ref.nodeId.toString()) || null;
+export function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): void {
+    const cloneInfoArray: CloneInfo[] = extraInfo.getClonedArray();
 
     // navigate through original objects to find those that are being references by node that
     // have been cloned .
     // this could be node organized by some FunctionalGroup
 
-    for (const { original, cloned } of extraInfo_.mapOrgToClone.values()) {
+    // istanbul ignore next
+    doTrace && traceLog(chalk.yellow("reconstructNonHierarchicalReferences"));
+
+    for (const { original, cloned } of cloneInfoArray) {
         apply(original, cloned);
     }
+
     function apply(original: BaseNode, cloned: BaseNode) {
         const addressSpace = original.addressSpace;
         // find NonHierarchical References on original object
@@ -231,54 +399,34 @@ export function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): vo
         }
 
         // istanbul ignore next
-        if (doDebug) {
-            debugLog(
-                " investigation ",
-                original.browseName.toString(),
-                cloned.nodeClass.toString(),
-                original.nodeClass.toString(),
-                original.nodeId.toString(),
-                cloned.nodeId.toString()
-            );
-        }
+        doTrace && traceLog(" investigation ", "original", fullPath2(original), NodeClass[cloned.nodeClass], fullPath2(cloned));
 
         for (const ref of originalNonHierarchical) {
-            const info = findImplementedObject(ref);
+            const info = findImplementedObject(cloneInfoArray, ref);
+            if (!info) continue;
 
             // if the object pointed by this reference is also cloned ...
-            if (info) {
-                const originalDest = info.original;
-                const cloneDest = info.cloned;
-
-                // istanbul ignore next
-                if (doDebug) {
-                    debugLog(
-                        "   adding reference ",
-                        ref.referenceType,
-                        addressSpace.findNode(ref.referenceType)!.browseName.toString(),
-                        " from cloned ",
-                        cloned.nodeId.toString(),
-                        cloned.browseName.toString(),
-                        " to cloned ",
-                        cloneDest.nodeId.toString(),
-                        cloneDest.browseName.toString()
-                    );
-                }
 
-                // restore reference
-                cloned.addReference({
-                    isForward: false,
-                    nodeId: cloneDest.nodeId,
-                    referenceType: ref.referenceType
-                });
-            } else {
-                //     // restore reference
-                //     cloned.addReference({
-                //         isForward: false,
-                //         nodeId: ref.nodeId,
-                //         referenceType: ref.referenceType
-                //     });
-            }
+            const originalDest = info.original;
+            const cloneDest = info.cloned;
+
+            // istanbul ignore next
+            doTrace &&
+                traceLog(
+                    "   adding reference ",
+                    fullPath2(addressSpace.findNode(ref.referenceType)!),
+                    " from cloned ",
+                    fullPath2(cloned),
+                    " to cloned ",
+                    fullPath2(cloneDest)
+                );
+
+            // restore reference
+            cloned.addReference({
+                isForward: false,
+                nodeId: cloneDest.nodeId,
+                referenceType: ref.referenceType
+            });
         }
     }
 }
@@ -303,14 +451,13 @@ export function reconstructNonHierarchicalReferences(extraInfo: CloneHelper): vo
  *                                +-------- Organizes---+
  */
 export function reconstructFunctionalGroupType(extraInfo: CloneHelper) {
-    const extraInfo_ = extraInfo as unknown as { mapOrgToClone: Map<string, CloneInfo> };
+    const cloneInfoArray: CloneInfo[] = extraInfo.getClonedArray();
 
     // navigate through original objects to find those that are being organized by some FunctionalGroup
-    for (const { original, cloned } of extraInfo_.mapOrgToClone.values()) {
+    for (const { original, cloned } of cloneInfoArray) {
         const organizedByArray = original.findReferencesEx("Organizes", BrowseDirection.Inverse);
-
         for (const ref of organizedByArray) {
-            const info = extraInfo_.mapOrgToClone.get(ref.nodeId.toString());
+            const info = findImplementedObject(cloneInfoArray, ref);
             if (!info) continue;
 
             const folder = info.original;

package/source/clone_options.ts

@@ -16,7 +16,12 @@ export interface CloneFilter {
     filterFor(childInstance: UAVariable | UAObject | UAMethod): CloneFilter;
 }
 export const defaultCloneFilter: CloneFilter = {
-    shouldKeep: () => true,
+    shouldKeep: (node: BaseNode) => {
+        if (node.modellingRule === "OptionalPlaceholder" || node.modellingRule === "MandatoryPlaceholder") {
+            return false;
+        }
+        return true;
+    },
     filterFor(node: BaseNode) {
         return this;
     }
@@ -26,11 +31,23 @@ export interface CloneExtraInfo {
     /* */
     level: number;
     pad(): string;
-    registerClonedObject(clonedNode: BaseNode, originalNode: BaseNode): void;
-    getCloned(originalObject: BaseNode): BaseNode | null;
+
+    pushContext(params: { clonedParent: BaseNode; originalParent: BaseNode }): void;
+    popContext(): void;
+    
+    registerClonedObject(params: { clonedNode: BaseNode; originalNode: BaseNode }): void;
+    getCloned(params: {
+        originalParent: BaseNode;
+        clonedParent: BaseNode;
+        originalNode: UAVariable | UAObject | UAMethod;
+    }): BaseNode | null;
 }
 
-export const makeDefaultCloneExtraInfo = (): CloneExtraInfo =>   new CloneHelper();
+export const makeDefaultCloneExtraInfo = (node: UAVariable | UAMethod | UAObject): CloneExtraInfo => {
+    const extraInfo = new CloneHelper();
+    extraInfo.pushContext({ originalParent: node, clonedParent: node });
+    return extraInfo;
+};
 
 export interface CloneOptions /* extends ConstructNodeIdOptions */ {
     namespace: INamespace;

package/source/session_context.ts

@@ -33,7 +33,7 @@ export interface IContinuationPointInfo<T> {
     statusCode: StatusCode;
 }
 export interface ContinuationData {
-    continuationPoint: ContinuationPoint | null;
+    continuationPoint?: ContinuationPoint | null;
     releaseContinuationPoints?: boolean;
     index?: number;
 }