node-opcua-address-space 2.113.0 → 2.114.0

package/src/ua_data_type_impl.ts

@@ -30,6 +30,7 @@ import * as tools from "./tool_isSubtypeOf";
 import { get_subtypeOf } from "./tool_isSubtypeOf";
 import { get_subtypeOfObj } from "./tool_isSubtypeOf";
 import { BaseNode_getCache } from "./base_node_private";
+import { Int64, coerceInt32, coerceInt64, coerceInt64toInt32 } from "node-opcua-basic-types";
 
 export interface UADataTypeImpl {
     _extensionObjectConstructor: ExtensionObjectConstructorFuncWithSchema;
@@ -230,7 +231,7 @@ export class UADataTypeImpl extends BaseNodeImpl implements UADataType {
             definition = enumValues.map((e: any) => {
                 return {
                     name: e.displayName.text,
-                    value: e.value[1]
+                    value: coerceInt64toInt32(e.value)
                 };
             });
         }
@@ -395,12 +396,15 @@ export function DataType_toString(this: UADataTypeImpl, options: ToStringOption)
     dataTypeDefinition_toString.call(this, options);
 }
 
+
+const defaultEnumValue: Int64 = coerceInt64(-1);
+
 function makeEnumDefinition(definitionFields: EnumFieldOptions[]) {
     return new EnumDefinition({
         fields: definitionFields.map((x) => ({
             description: x.description,
             name: x.name,
-            value: x.value
+            value: x.value === undefined ? defaultEnumValue : coerceInt64(x.value)
         }))
     });
 }

package/src/ua_variable_impl.ts

@@ -1,11 +1,7 @@
 /* eslint-disable max-statements */
-/* eslint-disable complexity */
 /**
  * @module node-opcua-address-space
  */
-// tslint:disable:no-bitwise
-// tslint:disable:no-console
-// tslint:disable:max-line-length
 import { types } from "util";
 import chalk from "chalk";
 
@@ -97,6 +93,7 @@ import {
     _touchValue
 } from "./ua_variable_impl_ext_obj";
 import { adjustDataValueStatusCode } from "./data_access/adjust_datavalue_status_code";
+import { _getBasicDataType } from "./get_basic_datatype";
 
 const debugLog = make_debugLog(__filename);
 const warningLog = make_warningLog(__filename);
@@ -714,23 +711,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
     }
 
     public getBasicDataType(): DataType {
-        if (this._basicDataType) {
-            return this._basicDataType;
-        }
-        if (this.dataType.namespace === 0 && this.dataType.value === 0) {
-            return DataType.Null;
-        }
-        const addressSpace = this.addressSpace;
-        if (!addressSpace) {
-            // may be node has been deleted already
-            return DataType.Null;
-        }
-        const dataTypeNode = addressSpace.findDataType(this.dataType)!;
-        const basicDataType =
-            dataTypeNode && dataTypeNode.nodeClass === NodeClass.DataType ? dataTypeNode.getBasicDataType() : DataType.Null;
-        // const basicDataType = addressSpace.findCorrespondingBasicDataType(this.dataType);
-        this._basicDataType = basicDataType;
-        return basicDataType;
+        return _getBasicDataType(this);
     }
     public adjustVariant(variant: Variant): Variant {
         return adjustVariant(variant, this.valueRank, this.getBasicDataType());
@@ -1425,7 +1406,9 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             // has not yet been loaded !
             return true;
         }
-
+        if (dataType.nodeId.namespace === 0 && dataType.nodeId.value === DataType.ExtensionObject) {
+            return true;
+        }
         const Constructor = addressSpace.getExtensionObjectConstructor(this.dataType);
 
         if (this.valueRank === -1) {

package/src/ua_variable_impl_ext_obj.ts

@@ -523,11 +523,16 @@ export function _bindExtensionObject(
         return uaVariable.$extensionObject;
     }
 
-    // istanbul ignore next
     if (uaVariable.dataTypeObj.isAbstract) {
-        warningLog("Warning the DataType associated with this Variable is abstract ", uaVariable.dataTypeObj.browseName.toString());
-        warningLog("You need to provide a extension object yourself ");
-        throw new Error("bindExtensionObject requires a extensionObject as associated dataType is only abstract");
+        // istanbul ignore next
+        if (!optionalExtensionObject) {
+            warningLog(
+                "Warning the DataType associated with this Variable is abstract ",
+                uaVariable.dataTypeObj.browseName.toString()
+            );
+            warningLog("You need to provide a extension object yourself ");
+            throw new Error("bindExtensionObject requires a extensionObject as associated dataType is only abstract");
+        }
     }
 
     const s = uaVariable.readValue();

package/src/ua_variable_type_impl.ts

@@ -13,10 +13,9 @@ import {
     ModellingRuleType,
     INamespace,
     UAVariable,
-    UAVariableType,
+    UAVariableType
 } from "node-opcua-address-space-base";
 
-
 import { coerceQualifiedName, NodeClass, QualifiedName, BrowseDirection, AttributeIds } from "node-opcua-data-model";
 import { DataValue, DataValueLike } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog, make_warningLog, make_errorLog } from "node-opcua-debug";
@@ -36,6 +35,7 @@ import * as tools from "./tool_isSubtypeOf";
 import { get_subtypeOfObj } from "./tool_isSubtypeOf";
 import { get_subtypeOf } from "./tool_isSubtypeOf";
 import { checkValueRankCompatibility } from "./check_value_rank_compatibility";
+import { _getBasicDataType } from "./get_basic_datatype";
 
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -306,9 +306,11 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
 
         return instance;
     }
+    public getBasicDataType(): DataType {
+        return _getBasicDataType(this);
+    }
 }
 
-
 /**
  * @method hasChildWithBrowseName
  * returns true if the parent object has a child  with the provided browseName
@@ -365,4 +367,3 @@ export function assertUnusedChildBrowseName(addressSpace: AddressSpacePrivate, o
         );
     }
 }
-