node-opcua-address-space 2.90.0 → 2.91.0

package/src/ua_variable_impl_ext_obj.ts

@@ -255,7 +255,7 @@ function installExt(uaVariable: UAVariableImpl, ext: ExtensionObject) {
         if (field.dataType) {
             const dataTypeNode = addressSpace.findDataType(field.dataType);
             // istanbul ignore next
-            if (dataTypeNode && dataTypeNode.isSupertypeOf(structure)) {
+            if (dataTypeNode && dataTypeNode.isSubtypeOf(structure)) {
                 // sub structure .. let make an handler too
                 const camelCaseName = lowerFirstLetter(field.name!);
 
@@ -265,7 +265,7 @@ function installExt(uaVariable: UAVariableImpl, ext: ExtensionObject) {
                         return uaVariable.getComponentByName(field.name!) as UAVariable | null;
                     }));
                 } else {
-                    warningLog("extension object is null");
+                    doDebug && warningLog("extension object is null");
                 }
             }
         }
@@ -389,7 +389,7 @@ function isVariableContainingExtensionObject(uaVariable: UAVariableImpl): boolea
     assert(structure.browseName.toString() === "Structure", "expecting DataType Structure to be in IAddressSpace");
 
     const dt = uaVariable.getDataTypeNode() as UADataTypeImpl;
-    if (!dt.isSupertypeOf(structure)) {
+    if (!dt.isSubtypeOf(structure)) {
         return false;
     }
     return true;
@@ -412,14 +412,7 @@ function _innerBindExtensionObjectScalar(uaVariable: UAVariableImpl,
     };
 
     installDataValueGetter(uaVariable, get);
-    assert(uaVariable._inner_replace_dataValue);
-    uaVariable._inner_replace_dataValue = (dataValue: DataValue, indexRange?: NumericRange | null) => {
-        /** */
-        const ext = dataValue.value.value;
-        const sourceTime = coerceClock(dataValue.sourceTimestamp, dataValue.sourcePicoseconds);
-        const cache = new Set<UAVariableImpl>();
-        set(ext, sourceTime, cache);
-    }
+    uaVariable.$set_ExtensionObject = set;
 
     _installFields2(uaVariable, {
         get: (fieldName: string) => {
@@ -437,6 +430,7 @@ function _innerBindExtensionObjectScalar(uaVariable: UAVariableImpl,
 }
 
 
+// eslint-disable-next-line complexity
 export function _bindExtensionObject(
     uaVariable: UAVariableImpl,
     optionalExtensionObject?: ExtensionObject,
@@ -444,10 +438,16 @@ export function _bindExtensionObject(
 ): ExtensionObject | null {
     options = options || { createMissingProp: false };
 
+    // istanbul ignore next
     if (!isVariableContainingExtensionObject(uaVariable)) {
         return null;
     }
 
+    // istanbul ignore next
+    if (optionalExtensionObject && uaVariable.valueRank === 0) {
+        warningLog(uaVariable.browseName.toString() + ": valueRank was zero but needed to be adjusted to -1 (Scalar) in bindExtensionObject");
+        uaVariable.valueRank = -1;
+    }
     const addressSpace = uaVariable.addressSpace;
     let extensionObject_;
 
@@ -469,7 +469,7 @@ export function _bindExtensionObject(
         const dataTypeNode = addressSpace.findNode(parentDataType) as UADataType;
         const structure = addressSpace.findDataType("Structure")!;
         // istanbul ignore next
-        if (dataTypeNode && dataTypeNode.isSupertypeOf(structure)) {
+        if (dataTypeNode && dataTypeNode.isSubtypeOf(structure)) {
             // warningLog(
             //     "Ignoring bindExtensionObject on sub extension object",
             //     "child=",
@@ -568,12 +568,16 @@ const composeBrowseNameAndNodeId = (uaVariable: UAVariable, indexes: number[]) =
 }
 
 
-// eslint-disable-next-line max-statements
+// eslint-disable-next-line max-statements, complexity
 export function _bindExtensionObjectArrayOrMatrix(
     uaVariable: UAVariableImpl,
     optionalExtensionObjectArray?: ExtensionObject[],
     options?: BindExtensionObjectOptions
 ): ExtensionObject[] {
+
+    options = options || { createMissingProp: false};
+    options.createMissingProp = options.createMissingProp || false;
+
     // istanbul ignore next
     if (uaVariable.valueRank < 1) {
         throw new Error("Variable must be a MultiDimensional array");
@@ -583,6 +587,12 @@ export function _bindExtensionObjectArrayOrMatrix(
     if (!isVariableContainingExtensionObject(uaVariable)) {
         return [];
     }
+
+    if (!optionalExtensionObjectArray && uaVariable.$dataValue.value.value) {
+        assert(Array.isArray(uaVariable.$dataValue.value.value));
+        optionalExtensionObjectArray = uaVariable.$dataValue.value.value;
+    }
+    
     if ((arrayDimensions.length === 0 || arrayDimensions.length === 1 && arrayDimensions[0] === 0) && optionalExtensionObjectArray) {
         arrayDimensions[0] = optionalExtensionObjectArray.length;
     }
@@ -636,10 +646,13 @@ export function _bindExtensionObjectArrayOrMatrix(
 
         const { browseName, nodeId } = composeBrowseNameAndNodeId(uaVariable, index);
 
-
-
         let uaElement = uaVariable.getComponentByName(browseName) as UAVariableImpl | null;
         if (!uaElement) {
+
+            if (!options.createMissingProp) {
+                continue;
+            }
+            
             uaElement = namespace.addVariable({
                 browseName,
                 nodeId,

package/src/ua_variable_type_impl.ts

@@ -37,9 +37,10 @@ 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 * as tools from "./tool_isSupertypeOf";
-import { get_subtypeOfObj } from "./tool_isSupertypeOf";
-import { get_subtypeOf } from "./tool_isSupertypeOf";
+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";
 
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -50,6 +51,7 @@ const errorLog = make_errorLog(__filename);
 let doTrace = checkDebugFlag("INSTANTIATE");
 const traceLog = errorLog;
 
+
 interface InstantiateS {
     propertyOf?: any;
     componentOf?: any;
@@ -83,7 +85,17 @@ export function topMostParentIsObjectTypeOrVariableType(addressSpace: AddressSpa
     return false;
 }
 export interface UAVariableTypeOptions extends InternalBaseNodeOptions {
-    /**  */
+    /**
+     * This attribute indicates whether the Value attribute of the Variableis an array and how many dimensions the array has.
+     * It may have the following values:
+     *   * n > 1: the Value is an array with the specified number of dimensions.
+     *   * OneDimension (1): The value is an array with one dimension.
+     *   * OneOrMoreDimensions (0): The value is an array with one or more dimensions.
+     *   * Scalar (−1): The value is not an array.
+     *   * Any (−2): The value can be a scalar or an array with any number of dimensions.
+     *   * ScalarOrOneDimension (−3): The value can be a scalar or a one dimensional array.
+     *   * All DataTypes are considered to be scalar, even if they have array-like semantics like ByteString and String.
+     */
     valueRank?: number;
     arrayDimensions?: number[] | null;
     historizing?: boolean;
@@ -91,6 +103,10 @@ export interface UAVariableTypeOptions extends InternalBaseNodeOptions {
     value?: any;
     dataType: NodeIdLike;
 }
+
+function deprecate<T>(func: T):T {
+    return func;
+}
 export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
     public readonly nodeClass = NodeClass.VariableType;
 
@@ -102,7 +118,10 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
         return get_subtypeOfObj.call(this) as UAVariableType;
     }
 
-    public isSupertypeOf = tools.construct_isSupertypeOf<UAVariableType>(UAVariableTypeImpl);
+    public isSubtypeOf = tools.construct_isSubtypeOf<UAVariableType>(UAVariableTypeImpl);
+
+     /** @deprecated - use  isSubtypeOf instead */
+     public isSupertypeOf = deprecate(tools.construct_isSubtypeOf<UAVariableType>(UAVariableTypeImpl));
 
     public readonly isAbstract: boolean;
     public dataType: NodeId;
@@ -227,6 +246,13 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
         assert(dataType instanceof NodeId);
 
         const valueRank = options.valueRank !== undefined ? options.valueRank : this.valueRank;
+
+        const { result, errorMessage } = checkValueRankCompatibility(valueRank, this.valueRank);
+        if (!result) {
+            errorLog(errorMessage);
+            throw new Error(errorMessage);
+        }
+
         const arrayDimensions = options.arrayDimensions !== undefined ? options.arrayDimensions : this.arrayDimensions;
 
         // istanbul ignore next

package/test_helpers/boiler_system.ts

@@ -248,11 +248,11 @@ export function createBoilerType(namespace: Namespace): BoilerType {
     }) as SignalToReference;
 
     const addressSpace = namespace.addressSpace;
-    flowTo.isSupertypeOf(addressSpace.findReferenceType("References")!);
-    flowTo.isSupertypeOf(addressSpace.findReferenceType("NonHierarchicalReferences")!);
-    hotFlowTo.isSupertypeOf(addressSpace.findReferenceType("References")!);
-    hotFlowTo.isSupertypeOf(addressSpace.findReferenceType("NonHierarchicalReferences")!);
-    hotFlowTo.isSupertypeOf(addressSpace.findReferenceType("FlowTo", namespace.index)!);
+    flowTo.isSubtypeOf(addressSpace.findReferenceType("References")!);
+    flowTo.isSubtypeOf(addressSpace.findReferenceType("NonHierarchicalReferences")!);
+    hotFlowTo.isSubtypeOf(addressSpace.findReferenceType("References")!);
+    hotFlowTo.isSubtypeOf(addressSpace.findReferenceType("NonHierarchicalReferences")!);
+    hotFlowTo.isSubtypeOf(addressSpace.findReferenceType("FlowTo", namespace.index)!);
 
     const NonHierarchicalReferences = addressSpace.findReferenceType("NonHierarchicalReferences");
 

package/test_helpers/test_fixtures/eurange_issue.xml

@@ -18,6 +18,7 @@
         <Alias Alias="HasProperty">i=46</Alias>
         <Alias Alias="HasSubtype">i=45</Alias>
         <Alias Alias="HasTypeDefinition">i=40</Alias>
+        <Alias Alias="PropertyType">i=68</Alias>
         <Alias Alias="Int32">i=6</Alias>
         <Alias Alias="Range">i=884</Alias>
         <Alias Alias="String">i=12</Alias>
@@ -33,7 +34,7 @@
 
     <UAVariable NodeId="ns=1;i=1301" BrowseName="Range" AccessLevel="3" DataType="Range">
         <References>
-            <Reference ReferenceType="HasTypeDefinition">i=1317</Reference>
+            <Reference ReferenceType="HasTypeDefinition">ns=1;i=1317</Reference>
             <Reference ReferenceType="HasModellingRule">i=78</Reference>
         </References>
         <Value>
@@ -54,7 +55,7 @@
     <UAVariableType NodeId="ns=1;i=1317" BrowseName="MyVariableType" AccessLevel="3" DataType="Range">
         <DisplayName>EURange</DisplayName>
         <References>
-            <Reference ReferenceType="HasSubtype" IsForward="false">i=68</Reference>
+            <Reference ReferenceType="HasSubtype" IsForward="false">PropertyType</Reference>
         </References>
         <Value>
             <ExtensionObject>