opcua-webapi-ts 1.1.23 → 1.1.24

package/dist/common/nodes/UaNode.d.ts

@@ -8,7 +8,6 @@ export declare abstract class UaNode {
     protected _writeMask: number | null;
     protected _parent: UaNode | null;
     protected _children: Array<UaNode>;
-    protected _refToParent: UaNodeId | null;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     abstract get nodeClass(): NodeClass;
     get nodeId(): UaNodeId;
@@ -18,16 +17,12 @@ export declare abstract class UaNode {
     set writeMask(writeMask: number);
     get description(): UaLocalizedText | null;
     set description(description: UaLocalizedText | null);
-    get refToParent(): UaNodeId | null;
-    set refToParent(referenceTypeId: UaNodeId | null);
     abstract toJson(): any;
 }
 export declare abstract class UaDefintionNode extends UaNode {
     protected _isAbstract: boolean;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get isAbstract(): boolean;
-    get refToParent(): UaNodeId | null;
-    set refToParent(referenceTypeId: UaNodeId);
     setParentType(parentType: UaDefintionNode): void;
     isSubtypeOf(typeId: UaNodeId): boolean;
     parentType(): UaDefintionNode | null;

package/dist/common/nodes/UaNode.js

@@ -12,7 +12,6 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
-        this._refToParent = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -35,12 +34,6 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
-    get refToParent() {
-        return this._refToParent;
-    }
-    set refToParent(referenceTypeId) {
-        this._refToParent = referenceTypeId;
-    }
 }
 exports.UaNode = UaNode;
 class UaDefintionNode extends UaNode {
@@ -51,12 +44,6 @@ class UaDefintionNode extends UaNode {
     get isAbstract() {
         return this._isAbstract;
     }
-    get refToParent() {
-        return (this._refToParent) ? this._refToParent : null;
-    }
-    set refToParent(referenceTypeId) {
-        this._refToParent = referenceTypeId;
-    }
     setParentType(parentType) {
         if (parentType.nodeClass != this.nodeClass ||
             null != this._parent)

package/dist/common/nodes/UaObject.js

@@ -49,15 +49,9 @@ class UaObject extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let variables = [];
-        let methods = [];
+        let members = [];
         for (let item of this._children) {
-            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
-                variables.push(item.toJson());
-            }
-            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
-                methods.push(item.toJson());
-            }
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -67,8 +61,7 @@ class UaObject extends _1.UaInstanceNode {
             description: (this._description) ? this._description.text : undefined,
             typeDefinitionId: this._typeDefinitionId.toString(),
             eventNotifier: (this._eventNotifier != 0) ? this._eventNotifier : undefined,
-            variables: (variables.length != 0) ? variables : undefined,
-            methods: (methods.length != 0) ? methods : undefined
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaObjectType.js

@@ -48,17 +48,9 @@ class UaObjectType extends _1.UaDefintionNode {
         this._isObjectMemberRead = value;
     }
     toJson() {
-        let variables = [];
-        let methods = [];
+        let members = [];
         for (let item of this._children) {
-            if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType)
-                continue;
-            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
-                variables.push(item.toJson());
-            }
-            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
-                methods.push(item.toJson());
-            }
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -67,8 +59,7 @@ class UaObjectType extends _1.UaDefintionNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             isAbstract: this._isAbstract,
-            variables: (variables.length != 0) ? variables : undefined,
-            methods: (methods.length != 0) ? methods : undefined
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaVariable.d.ts

@@ -9,6 +9,7 @@ export declare class UaVariable extends UaInstanceNode {
     private _userAccessLevel;
     private _historizing;
     private _dataValue;
+    private _isProperty;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, dataType: UaNodeId, valueRank: number, accessLevel: number, userAccessLevel: number, historizing: boolean, typeDefinitionId: UaNodeId);
     get nodeClass(): NodeClass;
     get dataType(): UaNodeId;
@@ -16,10 +17,12 @@ export declare class UaVariable extends UaInstanceNode {
     get accessLevel(): number;
     get userAccessLevel(): number;
     get historizing(): boolean;
+    get typeDefinitionId(): UaNodeId;
     get value(): UaVariant | null;
     get dataValue(): UaDataValue | null;
     set dataValue(value: UaDataValue);
-    get typeDefinitionId(): UaNodeId;
+    get isProperty(): boolean;
+    set isProperty(value: boolean);
     addMember(node: UaVariable): void;
     get variableMembers(): Array<UaVariable>;
     toJson(): any;

package/dist/common/nodes/UaVariable.js

@@ -13,6 +13,7 @@ class UaVariable extends _1.UaInstanceNode {
         this._historizing = historizing;
         this._typeDefinitionId = typeDefinitionId;
         this._dataValue = null;
+        this._isProperty = false;
     }
     get nodeClass() {
         return opcua_webapi_1.NodeClass.Variable;
@@ -32,6 +33,9 @@ class UaVariable extends _1.UaInstanceNode {
     get historizing() {
         return this._historizing;
     }
+    get typeDefinitionId() {
+        return this._typeDefinitionId;
+    }
     get value() {
         return (this._dataValue && this._dataValue.statusCode.isGood()) ? this._dataValue.value : null;
     }
@@ -41,8 +45,11 @@ class UaVariable extends _1.UaInstanceNode {
     set dataValue(value) {
         this._dataValue = value;
     }
-    get typeDefinitionId() {
-        return this._typeDefinitionId;
+    get isProperty() {
+        return this._isProperty;
+    }
+    set isProperty(value) {
+        this._isProperty = value;
     }
     addMember(node) {
         this._children.push(node);
@@ -55,11 +62,11 @@ class UaVariable extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
             if (item.nodeClass != opcua_webapi_1.NodeClass.Variable)
                 continue;
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -72,7 +79,7 @@ class UaVariable extends _1.UaInstanceNode {
             accessLevel: this._accessLevel,
             historizing: (this._historizing) ? true : undefined,
             value: this._dataValue ? this._dataValue.value.value : undefined,
-            children: (children.length != 0) ? children : undefined
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",