opcua-webapi-ts 1.1.22 → 1.1.24

package/dist/common/nodes/UaObject.js

@@ -49,9 +49,9 @@ class UaObject extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -60,8 +60,8 @@ class UaObject extends _1.UaInstanceNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             typeDefinitionId: this._typeDefinitionId.toString(),
-            eventNotifier: this._eventNotifier,
-            children: (children.length != 0) ? children : undefined
+            eventNotifier: (this._eventNotifier != 0) ? this._eventNotifier : undefined,
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaObjectType.js

@@ -48,11 +48,9 @@ class UaObjectType extends _1.UaDefintionNode {
         this._isObjectMemberRead = value;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
-            if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType)
-                continue;
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -61,7 +59,7 @@ class UaObjectType extends _1.UaDefintionNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             isAbstract: this._isAbstract,
-            children: (children.length != 0) ? children : 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(),
@@ -68,11 +75,11 @@ class UaVariable extends _1.UaInstanceNode {
             displayName: this._displayName.text,
             typeDefinitionId: this._typeDefinitionId.toString(),
             dataType: this._dataType.toString(),
-            valueRank: this._valueRank,
+            valueRank: (this._valueRank != 0) ? this._valueRank : undefined,
             accessLevel: this._accessLevel,
-            historizing: this._historizing,
+            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.22",
+  "version": "1.1.24",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",