node-opcua-address-space 2.97.0 → 2.98.1

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -31,7 +31,8 @@ import {
     UAEventType,
     BaseNode,
     UAObject,
-    InstantiateObjectOptions
+    InstantiateObjectOptions,
+    UAProperty
 } from "node-opcua-address-space-base";
 import { UAConditionVariable } from "node-opcua-nodeset-ua";
 
@@ -48,7 +49,6 @@ import { UAConditionType } from "../ua_condition_type";
 import { UABaseEventImpl } from "./ua_base_event_impl";
 import { ConditionSnapshotImpl } from "./condition_snapshot_impl";
 
-
 const debugLog = make_debugLog(__filename);
 const errorLog = make_errorLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -56,6 +56,8 @@ const warningLog = make_warningLog(__filename);
 
 export declare interface UAConditionImpl extends UAConditionEx, UABaseEventImpl {
     on(eventName: string, eventHandler: any): this;
+    conditionClassId: UAProperty<NodeId, /*c*/ DataType.NodeId>;
+    conditionClassName: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
 }
 /**
  *
@@ -452,7 +454,11 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
                 }
             }
         } else {
-            warningLog("Condition ", this.nodeId.toString(), "is not linked to a Object with a IsConditionOf(reversed(HasCondition))");
+            warningLog(
+                "Condition ",
+                this.nodeId.toString(),
+                "is not linked to a Object with a IsConditionOf(reversed(HasCondition))"
+            );
         }
         // xx console.log("MMMMMMMM%%%%%%%%%%%%%%%%%%%%% branch  " +
         // branch.getBranchId().toString() + " eventId = " + branch.getEventId().toString("hex"));
@@ -647,7 +653,6 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
     }
 }
 
-
 /**
  * instantiate a Condition.
  * this will create the unique EventId and will set eventType
@@ -1126,11 +1131,11 @@ function _add_comment_method(
     callback: CallbackT<CallMethodResultOptions>
 ) {
     //
-    // The AddComment Method is used to apply a comment to a specific state of a Condition 
-    // instance. Normally, the NodeId of the Object instance is passed as the ObjectId to the Call 
-    // Service. However, some Servers do not expose Condition instances in the AddressSpace. 
-    // Therefore, all Servers shall also allow Clients to call the AddComment Method by specifying 
-    // ConditionId as the ObjectId. The Method cannot be called with an ObjectId of the 
+    // The AddComment Method is used to apply a comment to a specific state of a Condition
+    // instance. Normally, the NodeId of the Object instance is passed as the ObjectId to the Call
+    // Service. However, some Servers do not expose Condition instances in the AddressSpace.
+    // Therefore, all Servers shall also allow Clients to call the AddComment Method by specifying
+    // ConditionId as the ObjectId. The Method cannot be called with an ObjectId of the
     // ConditionType Node.
     // Signature
     //   - EventId EventId identifying a particular Event Notification where a state was reported for a

package/src/base_node_private.ts

@@ -527,8 +527,8 @@ function _clone_children_on_template(
         return;
     }
     // we have found a matching child on the new parent.
-    // the mission is to enrich this child node with compoents and property that
-    // exists also in the template
+    // the mission is to enrich this child node with components and properties that
+    // exist also in the template
 
     let typeDefinitionNode: UAVariableType | UAObjectType | null = nodeToCloneTypeDefinition;
     while (typeDefinitionNode) {
@@ -580,7 +580,18 @@ function _clone_children_on_template(
                         ],
                         copyAlsoModellingRules
                     };
-                    const a = grandChild.clone(options, optionalFilter, extraInfo);
+
+                    const alreadyCloned = extraInfo.getCloned(grandChild);
+                    if (alreadyCloned) {
+                        alreadyCloned.addReference({
+                            referenceType: ref.referenceType,
+                            isForward: false,
+                            nodeId: newParentChild.nodeId
+                        });
+                    } else {
+                        const a = grandChild.clone(options, optionalFilter, extraInfo);
+                        extraInfo.registerClonedObject(a,grandChild);
+                    }
                 }
             }
         }
@@ -664,20 +675,36 @@ function _clone_collection_new(
             );
 
         extraInfo.level += 4;
-        const clone = node.clone(options, optionalFilter, extraInfo);
-        extraInfo.level -= 4;
-        doTrace && traceLog(extraInfo.pad(), "cloning => ", node.browseName.toString(), "nodeId", clone.nodeId.toString());
 
-        extraInfo.level++;
-        _clone_children_on_template(nodeToClone, newParent, node, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
-        extraInfo.level--;
+        const alreadyCloned = extraInfo.getCloned(node);
+        if (alreadyCloned) {
+            alreadyCloned.addReference({
+                referenceType: reference.referenceType,
+                isForward: false,
+                nodeId: newParent.nodeId
+            });
+        } else {
+            const clone = node.clone(options, optionalFilter, extraInfo);
 
-        // also clone or instantiate interface members that may be required in the optionals
-        extraInfo.level++;
-        _cloneInterface(nodeToClone, newParent, node, optionalFilter, extraInfo, browseNameMap);
-        extraInfo.level--;
+            extraInfo.level -= 4;
+            doTrace && traceLog(extraInfo.pad(), "cloning => ", node.browseName.toString(), "nodeId", clone.nodeId.toString());
 
-        if (extraInfo) {
+            extraInfo.level++;
+            _clone_children_on_template(
+                nodeToClone,
+                newParent,
+                node,
+                copyAlsoModellingRules,
+                optionalFilter,
+                extraInfo,
+                browseNameMap
+            );
+            extraInfo.level--;
+
+            // also clone or instantiate interface members that may be required in the optionals
+            extraInfo.level++;
+            _cloneInterface(nodeToClone, newParent, node, optionalFilter, extraInfo, browseNameMap);
+            extraInfo.level--;
             extraInfo.registerClonedObject(node, clone);
         }
     }
@@ -787,7 +814,7 @@ function _crap_extractInterfaces(typeDefinitionNode: UAObjectType | UAVariableTy
     const addressSpace = typeDefinitionNode.addressSpace;
     // example:
     // FolderType
-    //   FunctionalGroupType
+    //   (di):FunctionalGroupType
     //     MachineryItemIdentificationType     : IMachineryItemVendorNameplateType
     //       MachineIdentificationType         : IMachineTagNameplateType, IMachineVendorNamePlateType
     //         MachineToolIdentificationType
@@ -852,7 +879,21 @@ function _cloneInterface(
         _clone_collection_new(nodeToClone, node, aggregates, false, localFilter, extraInfo, browseNameMap);
     }
 }
-export function _clone_children_references(
+
+function __clone_organizes_references(
+    node: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
+    newParent: UAObject | UAVariable | UAMethod,
+    copyAlsoModellingRules: boolean,
+    optionalFilter: CloneFilter,
+    extraInfo: CloneExtraInfo,
+    browseNameMap: Set<string>
+): void {
+    // find all references that derives from the Organizes
+    const organizedRef = node.findReferencesEx("Organizes", BrowseDirection.Forward);
+    _clone_collection_new(node, newParent, organizedRef, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
+}
+
+function __clone_children_references(
     node: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
     newParent: UAObject | UAVariable | UAMethod,
     copyAlsoModellingRules: boolean,
@@ -860,11 +901,22 @@ export function _clone_children_references(
     extraInfo: CloneExtraInfo,
     browseNameMap: Set<string>
 ): void {
-    // find all reference that derives from the Aggregates
+    // find all references that derives from the Aggregates
     const aggregatesRef = node.findReferencesEx("Aggregates", BrowseDirection.Forward);
     _clone_collection_new(node, newParent, aggregatesRef, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
 }
 
+export function _clone_hierarchical_references(
+    node: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
+    newParent: UAObject | UAVariable | UAMethod,
+    copyAlsoModellingRules: boolean,
+    optionalFilter: CloneFilter,
+    extraInfo: CloneExtraInfo,
+    browseNameMap: Set<string>
+) {
+    __clone_children_references(node, newParent, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
+    __clone_organizes_references(node, newParent, copyAlsoModellingRules, optionalFilter, extraInfo, browseNameMap);
+}
 export function _clone_non_hierarchical_references(
     nodeToClone: UAObject | UAVariable | UAMethod | UAObjectType | UAVariableType,
     newParent: BaseNode,
@@ -900,7 +952,7 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
         !extraInfo || (extraInfo !== null && typeof extraInfo === "object" && typeof extraInfo.registerClonedObject === "function")
     );
     assert(!(this as any).subtypeOf, "We do not do cloning of Type yet");
-
+    assert(!extraInfo.getCloned(this), "object has already been cloned");
     const namespace = options.namespace;
     const constructorOptions: any = {
         ...options,
@@ -955,7 +1007,7 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
         const newFilter = optionalFilter.filterFor(cloneObj);
 
         const browseNameMap = new Set<string>();
-        _clone_children_references(this, cloneObj, options.copyAlsoModellingRules, newFilter!, extraInfo, browseNameMap);
+        _clone_hierarchical_references(this, cloneObj, options.copyAlsoModellingRules, newFilter!, extraInfo, browseNameMap);
 
         if (this.nodeClass === NodeClass.Object || this.nodeClass === NodeClass.Variable) {
             let typeDefinitionNode: UAVariableType | UAObjectType | null = this.typeDefinitionObj;
@@ -965,7 +1017,7 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
                         extraInfo?.pad(),
                         chalk.blueBright("---------------------- Exploring ", typeDefinitionNode.browseName.toString())
                     );
-                _clone_children_references(
+                _clone_hierarchical_references(
                     typeDefinitionNode,
                     cloneObj,
                     options.copyAlsoModellingRules,
@@ -976,14 +1028,7 @@ export function _clone<T extends UAObject | UAVariable | UAMethod>(
                 typeDefinitionNode = typeDefinitionNode.subtypeOfObj;
             }
         }
-        _clone_non_hierarchical_references(
-            this,
-            cloneObj,
-            options.copyAlsoModellingRules,
-            newFilter,
-            extraInfo,
-            browseNameMap
-        );
+        _clone_non_hierarchical_references(this, cloneObj, options.copyAlsoModellingRules, newFilter, extraInfo, browseNameMap);
     }
     cloneObj.propagate_back_references();
     cloneObj.install_extra_properties();

package/src/ua_variable_type_impl.ts

@@ -36,7 +36,7 @@ import { makeOptionalsMap, OptionalMap } from "../source/helpers/make_optionals_
 
 import { AddressSpacePrivate } from "./address_space_private";
 import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
-import { _clone_children_references, ToStringBuilder, UAVariableType_toString } from "./base_node_private";
+import { _clone_hierarchical_references, ToStringBuilder, UAVariableType_toString } from "./base_node_private";
 import * as tools from "./tool_isSubtypeOf";
 import { get_subtypeOfObj } from "./tool_isSubtypeOf";
 import { get_subtypeOf } from "./tool_isSubtypeOf";
@@ -51,7 +51,6 @@ const errorLog = make_errorLog(__filename);
 let doTrace = checkDebugFlag("INSTANTIATE");
 const traceLog = errorLog;
 
-
 interface InstantiateS {
     propertyOf?: any;
     componentOf?: any;
@@ -104,7 +103,7 @@ export interface UAVariableTypeOptions extends InternalBaseNodeOptions {
     dataType: NodeIdLike;
 }
 
-function deprecate<T>(func: T):T {
+function deprecate<T>(func: T): T {
     return func;
 }
 export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
@@ -120,8 +119,8 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
 
     public isSubtypeOf = tools.construct_isSubtypeOf<UAVariableType>(UAVariableTypeImpl);
 
-     /** @deprecated - use  isSubtypeOf instead */
-     public isSupertypeOf = deprecate(tools.construct_isSubtypeOf<UAVariableType>(UAVariableTypeImpl));
+    /** @deprecated - use  isSubtypeOf instead */
+    public isSupertypeOf = deprecate(tools.construct_isSubtypeOf<UAVariableType>(UAVariableTypeImpl));
 
     public readonly isAbstract: boolean;
     public dataType: NodeId;
@@ -492,6 +491,13 @@ class CloneHelper {
         }
         // find subTypeOf
     }
+    public getCloned(original: UAVariableType | UAObjectType): UAObject | UAVariable | UAMethod | null {
+        const info = this.mapOrgToClone.get(original.nodeId.toString());
+        if (info) {
+            return info.cloned;
+        }
+        return null;
+    }
 }
 // install properties and components on a instantiated Object
 //
@@ -508,12 +514,13 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
     typeDefinitionNode: T,
     copyAlsoModellingRules: boolean,
     optionalsMap: OptionalMap,
-    extraInfo: CloneHelper
+    extraInfo: CloneHelper, 
+    browseNameMap: Set<string>
 ) {
     if (doDebug) {
         debugLog("instance browseName =", instance.browseName.toString());
-        debugLog("typeNode         =", typeDefinitionNode.browseName.toString());
-        debugLog("optionalsMap     =", Object.keys(optionalsMap).join(" "));
+        debugLog("typeNode            =", typeDefinitionNode.browseName.toString());
+        debugLog("optionalsMap        =", Object.keys(optionalsMap).join(" "));
 
         const c = typeDefinitionNode.findReferencesEx("Aggregates");
         debugLog("typeDefinition aggregates      =", c.map((x) => x.node!.browseName.toString()).join(" "));
@@ -532,9 +539,8 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
             typeDefinitionNode.browseName.toString()
         );
 
-    const browseNameMap = new Set<string>();
-
-    _clone_children_references(typeDefinitionNode, instance, copyAlsoModellingRules, filter, extraInfo, browseNameMap);
+  
+    _clone_hierarchical_references(typeDefinitionNode, instance, copyAlsoModellingRules, filter, extraInfo, browseNameMap);
 
     // now apply recursion on baseTypeDefinition  to get properties and components from base class
 
@@ -561,7 +567,8 @@ function _initialize_properties_and_components<B extends UAObject | UAVariable |
         baseTypeDefinition,
         copyAlsoModellingRules,
         optionalsMap,
-        extraInfo
+        extraInfo,
+        browseNameMap
     );
     extraInfo.level--;
 }
@@ -616,9 +623,9 @@ export function assertUnusedChildBrowseName(addressSpace: AddressSpacePrivate, o
     if (parent && hasChildWithBrowseName(parent, coerceQualifiedName(options.browseName))) {
         throw new Error(
             "object " +
-            parent.browseName.name!.toString() +
-            " have already a child with browseName " +
-            options.browseName.toString()
+                parent.browseName.name!.toString() +
+                " have already a child with browseName " +
+                options.browseName.toString()
         );
     }
 }
@@ -773,14 +780,23 @@ function reconstructFunctionalGroupType(extraInfo: any) {
             if (!info) continue;
 
             const folder = info.original;
+            if (folder.nodeClass !== NodeClass.Object) continue;
+
+            if (!folder.typeDefinitionObj) continue;
 
             assert(folder.typeDefinitionObj.browseName.name.toString() === "FunctionalGroupType");
 
             // now create the same reference with the instantiated function group
-            const destFolder = info.cloned;
+            const destFolder = info.cloned as BaseNode;
 
             assert(ref.referenceType);
 
+            // may be we should check that the referenceType is a subtype of Organizes
+            const alreadyExist = destFolder.findReferences(ref.referenceType,  !ref.isForward).find((r) => r.nodeId === cloned.nodeId);
+            if (alreadyExist) {
+                continue;
+            }
+
             destFolder.addReference({
                 isForward: !ref.isForward,
                 nodeId: cloned.nodeId,
@@ -800,7 +816,9 @@ export function initialize_properties_and_components<
 
     const optionalsMap = makeOptionalsMap(optionals);
 
-    _initialize_properties_and_components(instance, topMostType, nodeType, copyAlsoModellingRules, optionalsMap, extraInfo);
+    const browseNameMap = new Set<string>();
+
+    _initialize_properties_and_components(instance, topMostType, nodeType, copyAlsoModellingRules, optionalsMap, extraInfo, browseNameMap);
 
     reconstructFunctionalGroupType(extraInfo);
 

package/.mocharc.yml

@@ -1,12 +0,0 @@
-recursive: true
-require:
-  - ../../node_modules/should
-  - ../../node_modules/ts-node/register
-timeout: 20000
-enable-source-maps: true
-extension: 
-  - .ts
-  - .js
-bail: true
-parallel: false
-jobs: 32

package/dist/src/tool_isSupertypeOf.d.ts

@@ -1,18 +0,0 @@
-/**
- * @module node-opcua-address-space
- */
-import { NodeId, NodeIdLike } from "node-opcua-nodeid";
-import { BaseNode, UADataType, UAObjectType, UAReferenceType, UAVariableType } from "node-opcua-address-space-base";
-import { BaseNodeImpl } from "./base_node_impl";
-export type BaseNodeConstructor<T extends BaseNode> = new () => T;
-export type MemberFuncValue<T, P, R> = (this: T, param: P) => R;
-export declare function wipeMemorizedStuff(node: any): void;
-export type IsSupertypeOfFunc<T extends UAType> = (this: T, baseType: T) => boolean;
-export type UAType = UAReferenceType | UADataType | UAObjectType | UAVariableType;
-export declare function construct_isSupertypeOf<T extends UAType>(Class: typeof BaseNodeImpl): IsSupertypeOfFunc<T>;
-export declare function construct_slow_isSupertypeOf<T extends UAType>(Class: typeof BaseNodeImpl): (this: T, baseType: T | NodeIdLike) => boolean;
-/**
- * returns the nodeId of the Type which is the super type of this
- */
-export declare function get_subtypeOf<T extends BaseNode>(this: T): NodeId | null;
-export declare function get_subtypeOfObj(this: BaseNode): BaseNode | null;

package/dist/src/tool_isSupertypeOf.js

@@ -1,125 +0,0 @@
-"use strict";
-/**
- * @module node-opcua-address-space
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.get_subtypeOfObj = exports.get_subtypeOf = exports.construct_slow_isSupertypeOf = exports.construct_isSupertypeOf = exports.wipeMemorizedStuff = void 0;
-const node_opcua_assert_1 = require("node-opcua-assert");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_nodeid_2 = require("node-opcua-nodeid");
-const base_node_private_1 = require("./base_node_private");
-const reference_impl_1 = require("./reference_impl");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const HasSubTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype");
-function _filterSubType(reference) {
-    return (0, node_opcua_nodeid_2.sameNodeId)(reference.referenceType, HasSubTypeNodeId) && !reference.isForward;
-}
-function _slow_isSupertypeOf(Class, baseType) {
-    if (!(baseType instanceof Class)) {
-        const node = this.addressSpace.findNode(baseType);
-        if (!node || !(node instanceof Class)) {
-            throw new Error("Invalid argument");
-        }
-        return _slow_isSupertypeOf.call(this, Class, node);
-    }
-    (0, node_opcua_assert_1.assert)(this instanceof Class);
-    (0, node_opcua_assert_1.assert)(baseType instanceof Class, " Object must have same type");
-    (0, node_opcua_assert_1.assert)(this.addressSpace);
-    if ((0, node_opcua_nodeid_2.sameNodeId)(this.nodeId, baseType.nodeId)) {
-        return true;
-    }
-    const references = this.allReferences();
-    const subTypes = references.filter(_filterSubType);
-    (0, node_opcua_assert_1.assert)(subTypes.length <= 1, "should have zero or one subtype no more");
-    for (const subType1 of subTypes) {
-        const subTypeId = subType1.nodeId;
-        const subTypeNode = this.addressSpace.findNode(subTypeId);
-        // istanbul ignore next
-        if (!subTypeNode) {
-            throw new Error("Cannot find object with nodeId " + subTypeId.toString());
-        }
-        if ((0, node_opcua_nodeid_2.sameNodeId)(subTypeNode.nodeId, baseType.nodeId)) {
-            return true;
-        }
-        else {
-            if (_slow_isSupertypeOf.call(subTypeNode, Class, baseType)) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-function wipeMemorizedStuff(node) {
-    if (!node.__cache) {
-        node.__cache = undefined;
-    }
-}
-exports.wipeMemorizedStuff = wipeMemorizedStuff;
-//  http://jsperf.com/underscore-js-memoize-refactor-test
-//  http://addyosmani.com/blog/faster-javascript-memoization/
-function wrap_memoize(func, hashFunc) {
-    if (undefined === hashFunc) {
-        hashFunc = (_p) => _p.toString();
-    }
-    return function memoize(param) {
-        if (!this.__cache) {
-            this.__cache = {};
-        }
-        const hash = hashFunc.call(this, param);
-        let cache_value = this.__cache[hash];
-        if (cache_value === undefined) {
-            cache_value = func.call(this, param);
-            this.__cache[hash] = cache_value;
-        }
-        return cache_value;
-    };
-}
-function hashBaseNode(e) {
-    return e.nodeId.value.toString();
-}
-function construct_isSupertypeOf(Class) {
-    return wrap_memoize(function (baseType) {
-        if (!(baseType instanceof Class)) {
-            throw new Error("expecting baseType to be " +
-                Class.name +
-                " but got " +
-                baseType.constructor.name +
-                " " +
-                node_opcua_data_model_1.NodeClass[baseType.nodeClass]);
-        }
-        if (!(this instanceof Class)) {
-            throw new Error("expecting this to be " + Class.name + " but got " + baseType.constructor.name);
-        }
-        return _slow_isSupertypeOf.call(this, Class, baseType);
-    }, hashBaseNode);
-}
-exports.construct_isSupertypeOf = construct_isSupertypeOf;
-function construct_slow_isSupertypeOf(Class) {
-    return function (baseType) {
-        return _slow_isSupertypeOf.call(this, Class, baseType);
-    };
-}
-exports.construct_slow_isSupertypeOf = construct_slow_isSupertypeOf;
-/**
- * returns the nodeId of the Type which is the super type of this
- */
-function get_subtypeOf() {
-    const s = get_subtypeOfObj.call(this);
-    return s ? s.nodeId : null;
-}
-exports.get_subtypeOf = get_subtypeOf;
-function get_subtypeOfObj() {
-    const _cache = (0, base_node_private_1.BaseNode_getCache)(this);
-    if (!_cache._subtypeOfObj) {
-        const is_subtype_of_ref = this.findReference("HasSubtype", false);
-        if (is_subtype_of_ref) {
-            _cache._subtypeOfObj = reference_impl_1.ReferenceImpl.resolveReferenceNode(this.addressSpace, is_subtype_of_ref);
-        }
-        else {
-            _cache._subtypeOfObj = null;
-        }
-    }
-    return _cache._subtypeOfObj;
-}
-exports.get_subtypeOfObj = get_subtypeOfObj;
-//# sourceMappingURL=tool_isSupertypeOf.js.map

package/dist/src/tool_isSupertypeOf.js.map

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

package/generate.js

@@ -1 +0,0 @@
-// nothing

package/source_nodejs/generate_address_space.ts

@@ -1,60 +0,0 @@
-import * as fs from "fs";
-import { callbackify } from "util";
-
-import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
-import { IAddressSpace } from "node-opcua-address-space-base";
-
-import { generateAddressSpaceRaw } from "..";
-import { NodeSetLoaderOptions } from "../source/interfaces/nodeset_loader_options";
-
-const doDebug = checkDebugFlag(__filename);
-const debugLog = make_debugLog(__filename);
-const errorLog = make_errorLog(__filename);
-
-export async function readNodeSet2XmlFile(xmlFile: string): Promise<string> {
-    // istanbul ignore next
-    if (!fs.existsSync(xmlFile)) {
-        const msg = "[NODE-OPCUA-E02] generateAddressSpace : cannot find nodeset2 xml file at " + xmlFile;
-        errorLog(msg);
-        throw new Error(msg);
-    }
-    debugLog(" parsing ", xmlFile);
-    const xmlData = await fs.promises.readFile(xmlFile, "utf-8");
-    return xmlData;
-}
-export function generateAddressSpace(
-    addressSpace: IAddressSpace,
-    xmlFiles: string | string[],
-    callback: (err?: Error) => void
-): void;
-export function generateAddressSpace(
-    addressSpace: IAddressSpace,
-    xmlFiles: string | string[],
-    options: NodeSetLoaderOptions | undefined,
-    callback: (err?: Error) => void
-): void;
-export function generateAddressSpace(
-    addressSpace: IAddressSpace,
-    xmlFiles: string | string[],
-    options?: NodeSetLoaderOptions
-): Promise<void>;
-export function generateAddressSpace(
-    ... args: any[]
-): any {
-    const addressSpace = args[0] as IAddressSpace;
-    const xmlFiles = args[1] as string | string[];
-    if (args.length === 4) {
-        const options = args[2] as NodeSetLoaderOptions | undefined;
-        const callback = args[3]  as (err?: Error) => void;
-        callbackify(generateAddressSpaceRaw)(addressSpace, xmlFiles, readNodeSet2XmlFile, options ||{}, callback!);
-    } else {
-        const options = {};
-        const callback = args[2]  as (err?: Error) => void;
-        callbackify(generateAddressSpaceRaw)(addressSpace, xmlFiles, readNodeSet2XmlFile, options, callback!);
-    }
-}
-
-// tslint:disable:no-var-requires
-// tslint:disable:max-line-length
-const thenify = require("thenify");
-(module.exports as any).generateAddressSpace = thenify.withCallback((module.exports as any).generateAddressSpace);

package/source_nodejs/index.ts

@@ -1 +0,0 @@
-export * from "./generate_address_space";