node-opcua-address-space 2.113.0 → 2.115.0

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -502,7 +502,7 @@ function _dumpVariantExtensionObjectValue(
     const { name, definition } = definitionMap.findDefinition(dataTypeNodeId);
     // const encodingDefaultXml = (getStructureTypeConstructor(schema.name) as any).encodingDefaultXml;
     const encodingDefaultXml = value.schema.encodingDefaultXml;
-    if (!encodingDefaultXml) {
+    if (!encodingDefaultXml || encodingDefaultXml.isEmpty()) {
         warningLog("dataType Name ", name, "with ", dataTypeNodeId.toString(), " does not have xml encoding");
         // throw new Error("Extension Object doesn't provide a XML ");
         return;
@@ -531,9 +531,10 @@ function _dumpVariantExtensionObjectValue(
     xw.endElement();
 }
 
-function _dumpVariantExtensionObjectValue2(xw: XmlWriter, dataTypeNode: UADataType, value: ExtensionObject) {
-    const addressSpace = dataTypeNode.addressSpace;
+function _dumpVariantExtensionObjectValue2(xw: XmlWriter, addressSpace: IAddressSpace, value: ExtensionObject) {
+    const dataTypeNodeId = value.schema.dataTypeNodeId;
     const definitionMap = makeDefinitionMap(addressSpace);
+    const dataTypeNode = addressSpace.findDataType(dataTypeNodeId)!;
     _dumpVariantExtensionObjectValue(xw, dataTypeNode.nodeId, definitionMap, value);
 }
 
@@ -604,22 +605,25 @@ function _isDefaultValue(value: Variant): boolean {
 }
 
 // eslint-disable-next-line max-statements
-function _dumpValue(xw: XmlWriter, node: UAVariable | UAVariableType, value: Variant) {
+function _dumpValue(xw: XmlWriter, node: UAVariable | UAVariableType, variant: Variant) {
     const addressSpace = node.addressSpace;
 
     // istanbul ignore next
-    if (value === null || value === undefined) {
+    if (variant === null || variant === undefined) {
         return;
     }
-    assert(value instanceof Variant);
+    assert(variant instanceof Variant);
 
     const dataTypeNode = addressSpace.findDataType(node.dataType);
+
+    // istanbul ignore next
     if (!dataTypeNode) {
-        debugLog("Cannot find dataType:", node.dataType);
+        debugLog("Cannot find dataType:", node.dataType.toString());
         return;
     }
+
     const dataTypeName = dataTypeNode.browseName.name!.toString();
-    const baseDataTypeName = DataType[value.dataType];
+    const baseDataTypeName = DataType[variant.dataType];
 
     if (baseDataTypeName === "Null") {
         return;
@@ -627,48 +631,48 @@ function _dumpValue(xw: XmlWriter, node: UAVariable | UAVariableType, value: Var
     assert(typeof baseDataTypeName === "string");
 
     // determine if dataTypeName is a ExtensionObject
-    const isExtensionObject = value.dataType === DataType.ExtensionObject;
+    const isExtensionObject = variant.dataType === DataType.ExtensionObject;
 
-    if (_isDefaultValue(value)) {
+    if (_isDefaultValue(variant)) {
         return;
     }
     xw.startElement("Value");
 
     const uax = getPrefix(xw, "http://opcfoundation.org/UA/2008/02/Types.xsd");
     if (isExtensionObject) {
-        const encodeXml = _dumpVariantExtensionObjectValue2.bind(null, xw, dataTypeNode);
+        const encodeXml = _dumpVariantExtensionObjectValue2.bind(null, xw, node.addressSpace);
 
-        switch (value.arrayType) {
+        switch (variant.arrayType) {
             case VariantArrayType.Matrix:
             case VariantArrayType.Array:
                 startElementEx(xw, uax, `ListOf${baseDataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-                value.value.forEach(encodeXml);
+                variant.value.forEach(encodeXml);
                 restoreDefaultNamespace(xw);
                 xw.endElement();
                 break;
             case VariantArrayType.Scalar:
-                encodeXml(value.value);
+                encodeXml(variant.value);
                 break;
             default:
                 errorLog(node.toString());
-                errorLog("_dumpValue : unsupported arrayType: ", value.arrayType);
+                errorLog("_dumpValue : unsupported arrayType: ", variant.arrayType);
         }
     } else {
-        const encodeXml = _dumpVariantValue.bind(null, xw, value.dataType, node);
-        switch (value.arrayType) {
+        const encodeXml = _dumpVariantValue.bind(null, xw, variant.dataType, node);
+        switch (variant.arrayType) {
             case VariantArrayType.Matrix:
             case VariantArrayType.Array:
                 startElementEx(xw, uax, `ListOf${dataTypeName}`, "http://opcfoundation.org/UA/2008/02/Types.xsd");
-                value.value.forEach(encodeXml);
+                variant.value.forEach(encodeXml);
                 restoreDefaultNamespace(xw);
                 xw.endElement();
                 break;
             case VariantArrayType.Scalar:
-                encodeXml(value.value);
+                encodeXml(variant.value);
                 break;
             default:
                 errorLog(node.toString());
-                errorLog("_dumpValue : unsupported arrayType: ", value.arrayType);
+                errorLog("_dumpValue : unsupported arrayType: ", variant.arrayType);
         }
     }
 
@@ -952,7 +956,6 @@ function dumpUAView(xw: XmlWriter, node: UAView) {
     xw.endElement();
 
     dumpAggregates(xw, node);
-
 }
 
 function dumpUADataType(xw: XmlWriter, node: UADataType) {
@@ -1054,11 +1057,11 @@ function dumpUAVariableType(xw: XmlWriter, node: UAVariableType) {
             // throw new Error(" cannot find datatype " + node.dataType);
             debugLog(
                 " cannot find datatype " +
-                node.dataType +
-                " for node " +
-                node.browseName.toString() +
-                " id =" +
-                node.nodeId.toString()
+                    node.dataType +
+                    " for node " +
+                    node.browseName.toString() +
+                    " id =" +
+                    node.nodeId.toString()
             );
         } else {
             const dataTypeName = b(xw, resolveDataTypeName(addressSpace, dataTypeNode.nodeId));
@@ -1266,7 +1269,6 @@ function writeAliases(xw: XmlWriter, aliases: Record<string, NodeIdString>) {
 }
 
 function constructNamespaceTranslationTable(dependency: INamespace[], exportedNamespace: INamespace): ITranslationTable {
-
     const translationTable: ITranslationTable = {};
     assert(dependency[0].namespaceUri === "http://opcfoundation.org/UA/");
 
@@ -1278,7 +1280,9 @@ function constructNamespaceTranslationTable(dependency: INamespace[], exportedNa
     }
     for (let i = 1; i < dependency.length; i++) {
         const dep = dependency[i];
-        if (exportedNamespace && exportedNamespace === dep) { continue; }
+        if (exportedNamespace && exportedNamespace === dep) {
+            continue;
+        }
         translationTable[dep.index] = counter++;
     }
     return translationTable;
@@ -1290,7 +1294,7 @@ function dumpReferenceType(xw: XmlWriter, referenceType: UAReferenceType) {
 
     dumpCommonAttributes(xw, referenceType);
 
-    const isSymmetric = (!referenceType.inverseName || referenceType.inverseName?.text === referenceType.browseName?.name);
+    const isSymmetric = !referenceType.inverseName || referenceType.inverseName?.text === referenceType.browseName?.name;
     if (isSymmetric) {
         xw.writeAttribute("Symmetric", "true");
     }
@@ -1363,7 +1367,7 @@ UADataTypeImpl.prototype.dumpXML = function (xw: XmlWriter) {
 
 UAViewImpl.prototype.dumpXML = function (xw: XmlWriter) {
     dumpUAView(xw, this);
-}
+};
 
 function makeTypeXsd(namespaceUri: string): string {
     return namespaceUri.replace(/\/$/, "") + "/Type.xsd";
@@ -1415,7 +1419,7 @@ NamespaceImpl.prototype.toNodeset2XML = function (this: NamespaceImpl) {
     xw.startElement("NamespaceUris");
 
     // let's sort the dependencies in the same order as the translation table
-    const sortedDependencies = dependency.sort((a, b) => translationTable[a.index] > translationTable[b.index] ? 1 : -1);
+    const sortedDependencies = dependency.sort((a, b) => (translationTable[a.index] > translationTable[b.index] ? 1 : -1));
 
     doDebug && debugLog(sortedDependencies.map((a) => a.index + " + " + a.namespaceUri).join("\n"));
     doDebug && debugLog("translation table ", translationTable);

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
         );
     }
 }
-