node-opcua-address-space 2.84.0 → 2.86.0

package/src/alarms_and_conditions/ua_limit_alarm_impl.ts

@@ -8,7 +8,7 @@ import { NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { make_warningLog } from "node-opcua-debug";
 import { NodeId } from "node-opcua-nodeid";
-import { StatusCodes } from "node-opcua-status-code";
+import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { DataType, VariantOptions } from "node-opcua-variant";
 import { UAShelvedStateMachineEx } from "../../source/interfaces/state_machine/ua_shelved_state_machine_ex";
 import { InstantiateLimitAlarmOptions } from "../../source/interfaces/alarms_and_conditions/instantiate_limit_alarm_options";
@@ -246,13 +246,13 @@ export class UALimitAlarmImpl extends UAAlarmConditionImpl implements UALimitAla
         assert(dataValue instanceof DataValue);
 
         if (
-            dataValue.statusCode === StatusCodes.BadWaitingForInitialData &&
-            dataValue.statusCode === StatusCodes.UncertainInitialValue
+            dataValue.statusCode.equals(StatusCodes.BadWaitingForInitialData) &&
+            dataValue.statusCode.equals(StatusCodes.UncertainInitialValue)
         ) {
             // we are not ready yet to use the input node value
             return;
         }
-        if (dataValue.statusCode !== StatusCodes.Good) {
+        if (dataValue.statusCode.isNotGood()) {
             // what shall we do ?
             this._signalNewCondition(null);
             return;

package/src/alarms_and_conditions/ua_off_normal_alarm_impl.ts

@@ -190,7 +190,7 @@ export class UAOffNormalAlarmImpl extends UADiscreteAlarmImpl implements UAOffNo
     }
 
     protected _onInputDataValueChange(dataValue: DataValue): void {
-        if (dataValue.statusCode !== StatusCodes.Good) {
+        if (dataValue.statusCode.isNotGood()) {
             // what shall we do ?
             return;
         }
@@ -204,7 +204,7 @@ export class UAOffNormalAlarmImpl extends UADiscreteAlarmImpl implements UAOffNo
     }
 
     protected _onNormalStateDataValueChange(dataValue: DataValue): void {
-        if (dataValue.statusCode !== StatusCodes.Good) {
+        if (dataValue.statusCode.isNotGood()) {
             // what shall we do ?
             return;
         }

package/src/base_node_private.ts

@@ -40,6 +40,7 @@ import { UANamespace_process_modelling_rule } from "./namespace_private";
 import { ReferenceImpl } from "./reference_impl";
 import { BaseNodeImpl, getReferenceType } from "./base_node_impl";
 import { AddressSpacePrivate } from "./address_space_private";
+import { wipeMemorizedStuff } from "./tool_isSupertypeOf";
 
 // eslint-disable-next-line prefer-const
 let doTrace = checkDebugFlag("INSTANTIATE");
@@ -126,6 +127,7 @@ export function BaseNode_clearCache(node: BaseNode): void {
     if (_private && _private._cache) {
         _private._cache = {};
     }
+    wipeMemorizedStuff(node);
 }
 const hasTypeDefinition_ReferenceTypeNodeId = resolveNodeId("HasTypeDefinition");
 
@@ -681,6 +683,10 @@ function _cloneInterface(
 
     extraInfo = extraInfo || defaultExtraInfo;
     const addressSpace = node.addressSpace;
+
+    if (node.nodeClass !== NodeClass.Object && node.nodeClass !== NodeClass.Variable) {
+        return;
+    }
     const typeDefinitionNode = node.typeDefinitionObj;
     if (!typeDefinitionNode) {
         return;

package/src/historical_access/address_space_historical_data_node.ts

@@ -224,7 +224,7 @@ function _update_startOfOnlineArchive(this: UAVariableImpl, newDate: Date): void
     const startOfArchiveDataValue = _get_startOfOfflineArchive(this);
     if (
         startOfArchiveDataValue &&
-        (startOfArchiveDataValue.statusCode !== StatusCodes.Good ||
+        (startOfArchiveDataValue.statusCode.isNotGood() ||
             !startOfArchiveDataValue.value ||
             !startOfArchiveDataValue.value.value ||
             startOfArchiveDataValue.value.value.getTime() >= newDate.getTime())
@@ -806,8 +806,8 @@ export function AddressSpace_installHistoricalDataNode(
 
     const dataValue = node.readValue();
     if (
-        dataValue.statusCode !== StatusCodes.BadWaitingForInitialData &&
-        dataValue.statusCode !== StatusCodes.UncertainInitialValue
+        dataValue.statusCode.isNot(StatusCodes.BadWaitingForInitialData) &&
+        dataValue.statusCode.isNot(StatusCodes.UncertainInitialValue)
     ) {
         on_value_change.call(node, dataValue);
     }

package/src/namespace_impl.ts

@@ -10,7 +10,7 @@ import { AxisScaleEnumeration } from "node-opcua-data-access";
 import { AccessRestrictionsFlag, coerceLocalizedText, QualifiedNameLike } from "node-opcua-data-model";
 import { QualifiedName } from "node-opcua-data-model";
 import { BrowseDirection } from "node-opcua-data-model";
-import { LocalizedText, NodeClass } from "node-opcua-data-model";
+import { NodeClass } from "node-opcua-data-model";
 import { dumpIf, make_errorLog } from "node-opcua-debug";
 import { NodeIdLike, NodeIdType, resolveNodeId } from "node-opcua-nodeid";
 import { NodeId } from "node-opcua-nodeid";
@@ -124,7 +124,7 @@ import { UAReferenceTypeImpl } from "./ua_reference_type_impl";
 import { UAViewImpl } from "./ua_view_impl";
 import { UAStateMachineImpl, UATransitionImpl } from "./state_machine/finite_state_machine";
 import { _addMultiStateValueDiscrete } from "./data_access/ua_multistate_value_discrete_impl";
-import { notDeepEqual } from "assert";
+
 
 function _makeHashKey(nodeId: NodeId): string | number {
     switch (nodeId.identifierType) {
@@ -615,7 +615,7 @@ export class NamespaceImpl implements NamespacePrivate {
         assert(!Object.prototype.hasOwnProperty.call(options, "nodeClass"));
         assert(Object.prototype.hasOwnProperty.call(options, "browseName"), "must provide a browseName");
 
-        const options1 = options as any;
+        const options1 = options as unknown as { nodeClass: NodeClass; references: AddReferenceOpts[]; subtypeOf: UADataType };
         options1.nodeClass = NodeClass.DataType;
         options1.references = options.references || [];
 
@@ -638,6 +638,9 @@ export class NamespaceImpl implements NamespacePrivate {
             });
         }
         const node = this.internalCreateNode(options) as UADataType;
+
+        node.propagate_back_references();
+        
         return node;
     }
 

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -1,9 +1,12 @@
 import { INamespace, UADataType, UAVariable, UAVariableType } from "node-opcua-address-space-base";
 import { NodeClass } from "node-opcua-data-model";
 import { StructureField } from "node-opcua-types";
+import { make_warningLog } from "node-opcua-debug";
 import { NamespacePrivate } from "../namespace_private";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 
+const warningLog = make_warningLog(__filename);
+
 function _constructNamespaceDependency(
     namespace: INamespace,
     dependency: INamespace[],
@@ -43,6 +46,12 @@ function _constructNamespaceDependency(
         if (_visitedDataType.has(dataType.toString())) {
             return;
         }
+        // istanbul ignore next
+        if (dataTypeNode.nodeClass !== NodeClass.DataType) {
+            warningLog("exploreDataTypes! ignoring ",dataTypeNode.toString());
+            return;
+        }
+
         const namespaceIndex = dataType.namespace;
         consider(namespaceIndex);
         if (dataTypeNode.isStructure()) {

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -35,7 +35,6 @@ import { AttributeIds, Int64, minOPCUADate, StatusCode, StatusCodes } from "node
 import { BrowseDescription, EnumDefinition, StructureDefinition, StructureType } from "node-opcua-types";
 
 import { ITranslationTable, XmlWriter } from "../../source/xml_writer";
-import { NamespacePrivate } from "../namespace_private";
 import { ReferenceImpl } from "../reference_impl";
 import { BaseNodeImpl, getReferenceType } from "../base_node_impl";
 import { UAReferenceTypeImpl } from "../ua_reference_type_impl";
@@ -251,6 +250,10 @@ function findXsdNamespaceUri(xw: XmlWriter, nodeId: NodeId): string {
     if (namespace === "http://opcfoundation.org/UA/") {
         return "http://opcfoundation.org/UA/2008/02/Types.xsd";
     }
+    // istanbul ignore next
+    if (!namespace) {
+        return "";
+    }
     return namespace.replace(/\/$/, "") + "/Types.xsd";
 }
 
@@ -919,7 +922,7 @@ function _dumpUADataTypeDefinition(xw: XmlWriter, uaDataType: UADataType) {
 
         const dataValue = uaDataType.readAttribute(SessionContext.defaultContext, AttributeIds.DataTypeDefinition);
 
-        if (true || dataValue.statusCode === StatusCodes.Good) {
+        if (true || dataValue.statusCode.isGood()) {
             const definition = uaDataType.getStructureDefinition();
             const baseDefinition = uaDataTypeBase ? uaDataTypeBase.getStructureDefinition() : null;
             xw.startElement("Definition");

package/src/state_machine/finite_state_machine.ts

@@ -403,7 +403,7 @@ export class UAStateMachineImpl extends UAObjectImpl implements UAStateMachineEx
 
         const d = this.currentState.readValue();
 
-        if (d.statusCode !== StatusCodes.Good) {
+        if (d.statusCode.isNotGood()) {
             this.setState(null);
         } else {
             const txt =

package/src/state_machine/ua_two_state_variable.ts

@@ -76,7 +76,7 @@ function _getEffectiveDisplayName<T, DT extends DataType>(
     node: UATwoStateVariableImpl
 ): DataValueT<LocalizedText, DataType.LocalizedText> {
     const humanReadableString = _getHumanReadableString(node);
-    if (humanReadableString.statusCode !== StatusCodes.Good) {
+    if (humanReadableString.statusCode.isNotGood()) {
         return humanReadableString;
     }
     const boolValue = node.getValue();
@@ -97,7 +97,7 @@ function _getEffectiveDisplayName<T, DT extends DataType>(
 function _getHumanReadableString(node: UATwoStateVariableImpl): DataValueT<LocalizedText, DataType.LocalizedText> {
     const dataValue = node.id.readValue();
 
-    if (dataValue.statusCode !== StatusCodes.Good) {
+    if (dataValue.statusCode.isNotGood()) {
         const _c = dataValue.clone() as DataValueT<LocalizedText, DataType.LocalizedText>;
         _c.value = new Variant({
             dataType: DataType.LocalizedText,
@@ -313,7 +313,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
         assert(typeof boolValue === "boolean");
         const dataValue = this.id!.readValue();
         const oldValue = dataValue.value.value;
-        if (dataValue.statusCode === StatusCodes.Good && boolValue === oldValue) {
+        if (dataValue.statusCode.isGood() && boolValue === oldValue) {
             return; // nothing to do
         }
         //
@@ -328,7 +328,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
      */
     public getValue(): boolean {
         const dataValue = this.id!.readValue();
-        assert(dataValue.statusCode === StatusCodes.Good);
+        assert(dataValue.statusCode.isGood());
         assert(dataValue.value.dataType === DataType.Boolean);
         return dataValue.value.value;
     }
@@ -339,7 +339,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
      */
     public getValueAsString(): string {
         const dataValue = this.readValue();
-        assert(dataValue.statusCode === StatusCodes.Good);
+        assert(dataValue.statusCode.isGood());
         assert(dataValue.value.dataType === DataType.LocalizedText);
         return dataValue.value.value.text?.toString() || "";
     }

package/src/tool_isSupertypeOf.ts

@@ -60,6 +60,11 @@ function _slow_isSupertypeOf<T extends UAType>(this: T, Class: typeof BaseNodeIm
 
 export type MemberFuncValue<T, P, R> = (this: T, param: P) => R;
 
+export function wipeMemorizedStuff(node: any) {
+    if (!node.__cache) {
+        node.__cache = undefined;
+    }
+}
 //  http://jsperf.com/underscore-js-memoize-refactor-test
 //  http://addyosmani.com/blog/faster-javascript-memoization/
 function wrap_memoize<T, P, R>(

package/src/ua_variable_impl.ts

@@ -97,9 +97,7 @@ const warningLog = make_warningLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 const errorLog = make_errorLog(__filename);
 
-function isGoodish(statusCode: StatusCode) {
-    return statusCode.value < 0x10000000;
-}
+
 
 export function adjust_accessLevel(accessLevel: string | number | null): AccessLevelFlag {
     accessLevel = utils.isNullOrUndefined(accessLevel) ? "CurrentRead | CurrentWrite" : accessLevel;
@@ -494,7 +492,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
 
         let dataValue = this.$dataValue;
 
-        if (isGoodish(dataValue.statusCode)) {
+        if (dataValue.statusCode.isGoodish()) {
             // note : extractRange will clone the dataValue
             dataValue = extractRange(dataValue, indexRange);
         }
@@ -542,7 +540,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
     public asyncRefresh(oldestDate: Date, callback: CallbackT<DataValue>): void;
     public asyncRefresh(oldestDate: Date): Promise<DataValue>;
     public asyncRefresh(...args: any[]): any {
-        if (isGoodish(this.$dataValue.statusCode)) {
+        if (this.$dataValue.statusCode.isGoodish()) {
             this.verifyVariantCompatibility(this.$dataValue.value);
         }
 
@@ -1980,7 +1978,7 @@ function _Variable_bind_with_async_refresh(this: UAVariableImpl, options: any) {
 
     this.refreshFunc = options.refreshFunc;
 
-    // assert(this.readValue().statusCode === StatusCodes.BadNodeIdUnknown);
+    // assert(this.readValue().statusCode.equals(StatusCodes.BadNodeIdUnknown));
     this.$dataValue.statusCode = StatusCodes.UncertainInitialValue;
 
     // TO DO : REVISIT THIS ASSUMPTION
@@ -2071,7 +2069,7 @@ function _Variable_bind_with_simple_get(this: UAVariableImpl, options: GetterOpt
         if (is_StatusCode(value)) {
             return new DataValue({ statusCode: value });
         } else {
-            if (!this.$dataValue || !isGoodish(this.$dataValue.statusCode) || !sameVariant(this.$dataValue.value, value)) {
+            if (!this.$dataValue || !this.$dataValue.statusCode.isGoodish() || !sameVariant(this.$dataValue.value, value)) {
                 this.setValueFromSource(value, StatusCodes.Good);
             }
             return this.$dataValue;

package/src/ua_variable_type_impl.ts

@@ -242,7 +242,7 @@ export class UAVariableTypeImpl extends BaseNodeImpl implements UAVariableType {
         // BadAttributeIdInvalid
         const defaultDataValue = this.readAttribute(null, AttributeIds.Value);
         const defaultValue =
-            (defaultDataType.namespace === 0 && defaultDataType.value == 0) || defaultDataValue.statusCode !== StatusCodes.Good
+            (defaultDataType.namespace === 0 && defaultDataType.value == 0) || defaultDataValue.statusCode.isNotGood()
                 ? undefined
                 : defaultDataValue.value;