node-opcua-service-filter 2.71.0 → 2.72.2

package/dist/imports.d.ts

@@ -1,4 +1,4 @@
-/**
- * @module node-opcua-service-filter
- */
-export { FilterOperator, AttributeOperand, ElementOperand, FilterOperand, LiteralOperand, SimpleAttributeOperand, MonitoringFilter, ContentFilterElement, ContentFilter, EventFilter, DataChangeFilter, AttributeOperandOptions, ElementOperandOptions, FilterOperandOptions, LiteralOperandOptions, SimpleAttributeOperandOptions, MonitoringFilterOptions, ContentFilterElementOptions, ContentFilterOptions, EventFilterOptions } from "node-opcua-types";
+/**
+ * @module node-opcua-service-filter
+ */
+export { FilterOperator, AttributeOperand, ElementOperand, FilterOperand, LiteralOperand, SimpleAttributeOperand, MonitoringFilter, ContentFilterElement, ContentFilter, EventFilter, DataChangeFilter, AttributeOperandOptions, ElementOperandOptions, FilterOperandOptions, LiteralOperandOptions, SimpleAttributeOperandOptions, MonitoringFilterOptions, ContentFilterElementOptions, ContentFilterOptions, EventFilterOptions } from "node-opcua-types";

package/dist/imports.js

@@ -1,19 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataChangeFilter = exports.EventFilter = exports.ContentFilter = exports.ContentFilterElement = exports.MonitoringFilter = exports.SimpleAttributeOperand = exports.LiteralOperand = exports.FilterOperand = exports.ElementOperand = exports.AttributeOperand = exports.FilterOperator = void 0;
-/**
- * @module node-opcua-service-filter
- */
-var node_opcua_types_1 = require("node-opcua-types");
-Object.defineProperty(exports, "FilterOperator", { enumerable: true, get: function () { return node_opcua_types_1.FilterOperator; } });
-Object.defineProperty(exports, "AttributeOperand", { enumerable: true, get: function () { return node_opcua_types_1.AttributeOperand; } });
-Object.defineProperty(exports, "ElementOperand", { enumerable: true, get: function () { return node_opcua_types_1.ElementOperand; } });
-Object.defineProperty(exports, "FilterOperand", { enumerable: true, get: function () { return node_opcua_types_1.FilterOperand; } });
-Object.defineProperty(exports, "LiteralOperand", { enumerable: true, get: function () { return node_opcua_types_1.LiteralOperand; } });
-Object.defineProperty(exports, "SimpleAttributeOperand", { enumerable: true, get: function () { return node_opcua_types_1.SimpleAttributeOperand; } });
-Object.defineProperty(exports, "MonitoringFilter", { enumerable: true, get: function () { return node_opcua_types_1.MonitoringFilter; } });
-Object.defineProperty(exports, "ContentFilterElement", { enumerable: true, get: function () { return node_opcua_types_1.ContentFilterElement; } });
-Object.defineProperty(exports, "ContentFilter", { enumerable: true, get: function () { return node_opcua_types_1.ContentFilter; } });
-Object.defineProperty(exports, "EventFilter", { enumerable: true, get: function () { return node_opcua_types_1.EventFilter; } });
-Object.defineProperty(exports, "DataChangeFilter", { enumerable: true, get: function () { return node_opcua_types_1.DataChangeFilter; } });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataChangeFilter = exports.EventFilter = exports.ContentFilter = exports.ContentFilterElement = exports.MonitoringFilter = exports.SimpleAttributeOperand = exports.LiteralOperand = exports.FilterOperand = exports.ElementOperand = exports.AttributeOperand = exports.FilterOperator = void 0;
+/**
+ * @module node-opcua-service-filter
+ */
+var node_opcua_types_1 = require("node-opcua-types");
+Object.defineProperty(exports, "FilterOperator", { enumerable: true, get: function () { return node_opcua_types_1.FilterOperator; } });
+Object.defineProperty(exports, "AttributeOperand", { enumerable: true, get: function () { return node_opcua_types_1.AttributeOperand; } });
+Object.defineProperty(exports, "ElementOperand", { enumerable: true, get: function () { return node_opcua_types_1.ElementOperand; } });
+Object.defineProperty(exports, "FilterOperand", { enumerable: true, get: function () { return node_opcua_types_1.FilterOperand; } });
+Object.defineProperty(exports, "LiteralOperand", { enumerable: true, get: function () { return node_opcua_types_1.LiteralOperand; } });
+Object.defineProperty(exports, "SimpleAttributeOperand", { enumerable: true, get: function () { return node_opcua_types_1.SimpleAttributeOperand; } });
+Object.defineProperty(exports, "MonitoringFilter", { enumerable: true, get: function () { return node_opcua_types_1.MonitoringFilter; } });
+Object.defineProperty(exports, "ContentFilterElement", { enumerable: true, get: function () { return node_opcua_types_1.ContentFilterElement; } });
+Object.defineProperty(exports, "ContentFilter", { enumerable: true, get: function () { return node_opcua_types_1.ContentFilter; } });
+Object.defineProperty(exports, "EventFilter", { enumerable: true, get: function () { return node_opcua_types_1.EventFilter; } });
+Object.defineProperty(exports, "DataChangeFilter", { enumerable: true, get: function () { return node_opcua_types_1.DataChangeFilter; } });
 //# sourceMappingURL=imports.js.map

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-/**
- * @module node-opcua-service-filter
- */
-export * from "./imports";
-export * from "./tools_event_filter";
+/**
+ * @module node-opcua-service-filter
+ */
+export * from "./imports";
+export * from "./tools_event_filter";

package/dist/index.js

@@ -1,54 +1,54 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @module node-opcua-service-filter
- */
-__exportStar(require("./imports"), exports);
-__exportStar(require("./tools_event_filter"), exports);
-// The SimpleAttributeOperand is a simplified form of the AttributeOperand and all of the rules that
-// apply to the AttributeOperand also apply to the SimpleAttributeOperand. The examples provided in
-// B.1 only use AttributeOperand, however, the AttributeOperand can be replaced by a
-// SimpleAttributeOperand whenever all ReferenceTypes in the RelativePath are subtypes of
-// HierarchicalReferences and the targets are Object or Variable Nodes and an Alias is not required
-// typeDefinitionId
-// This parameter restricts the operand to instances of the TypeDefinitionNode or
-// one of its subtypes.
-// { name: "typeDefinitionId", fieldType:"NodeId",documentation:"NodeId of a TypeDefinitionNode."},
-// browsePath
-// A relative path to a Node.
-// This parameter specifies a relative path using a list of BrowseNames instead of
-// the RelativePath structure used in the AttributeOperand. The list of
-// BrowseNames is equivalent to a RelativePath that specifies forward references
-// which are subtypes of the HierarchicalReferences ReferenceType.
-// All Nodes followed by the browsePath shall be of the NodeClass Object or
-// Variable.
-// If this list is empty the Node is the instance of the TypeDefinition.
-//  { name: "browsePath", isArray:true, fieldType:"QualifiedName"},
-// Id of the Attribute. The IntegerId is defined in 7.13.
-// The Value Attribute shall be supported by all Servers. The support of other
-// Attributes depends on requirements set in Profiles or other parts of this
-// specification.
-// { name: "attributeId", fieldType:"IntegerId"},
-// This parameter is used to identify a single element of an array, or a single range
-// of indexes for an array. The first element is identified by index 0 (zero).
-// This parameter is ignored if the selected Node is not a Variable or the Value of a
-// Variable is not an array.
-// The parameter is null if not specified.
-// All values in the array are used if this parameter is not specified.
-// The NumericRange type is defined in 7.21.
-// { name: "indexRange", fieldType:"NumericRange"}
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @module node-opcua-service-filter
+ */
+__exportStar(require("./imports"), exports);
+__exportStar(require("./tools_event_filter"), exports);
+// The SimpleAttributeOperand is a simplified form of the AttributeOperand and all of the rules that
+// apply to the AttributeOperand also apply to the SimpleAttributeOperand. The examples provided in
+// B.1 only use AttributeOperand, however, the AttributeOperand can be replaced by a
+// SimpleAttributeOperand whenever all ReferenceTypes in the RelativePath are subtypes of
+// HierarchicalReferences and the targets are Object or Variable Nodes and an Alias is not required
+// typeDefinitionId
+// This parameter restricts the operand to instances of the TypeDefinitionNode or
+// one of its subtypes.
+// { name: "typeDefinitionId", fieldType:"NodeId",documentation:"NodeId of a TypeDefinitionNode."},
+// browsePath
+// A relative path to a Node.
+// This parameter specifies a relative path using a list of BrowseNames instead of
+// the RelativePath structure used in the AttributeOperand. The list of
+// BrowseNames is equivalent to a RelativePath that specifies forward references
+// which are subtypes of the HierarchicalReferences ReferenceType.
+// All Nodes followed by the browsePath shall be of the NodeClass Object or
+// Variable.
+// If this list is empty the Node is the instance of the TypeDefinition.
+//  { name: "browsePath", isArray:true, fieldType:"QualifiedName"},
+// Id of the Attribute. The IntegerId is defined in 7.13.
+// The Value Attribute shall be supported by all Servers. The support of other
+// Attributes depends on requirements set in Profiles or other parts of this
+// specification.
+// { name: "attributeId", fieldType:"IntegerId"},
+// This parameter is used to identify a single element of an array, or a single range
+// of indexes for an array. The first element is identified by index 0 (zero).
+// This parameter is ignored if the selected Node is not a Variable or the Value of a
+// Variable is not an array.
+// The parameter is null if not specified.
+// All values in the array are used if this parameter is not specified.
+// The NumericRange type is defined in 7.21.
+// { name: "indexRange", fieldType:"NumericRange"}
 //# sourceMappingURL=index.js.map

package/dist/tools_event_filter.d.ts

@@ -1,32 +1,32 @@
-/**
- * @module node-opcua-service-filter
- */
-import { NodeId } from "node-opcua-nodeid";
-import { EventFilter, SimpleAttributeOperand } from "./imports";
-/**
- * helper to construct event filters:
- * construct a simple event filter
- *
- *
- * @example
- *
- *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
- *
- *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
- *     constructEventFilter(["SourceName","2:MyData" ]);
- *
- *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
- *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
- *
- */
-export declare function constructEventFilter(arrayOfNames: string[] | string, conditionTypes?: NodeId[] | NodeId): EventFilter;
-/**
- * @class SimpleAttributeOperand
- * @method toShortString
- * @return {String}
- *
- * @example:
- *
- *
- */
-export declare function simpleAttributeOperandToShortString(self: SimpleAttributeOperand, addressSpace: any): string;
+/**
+ * @module node-opcua-service-filter
+ */
+import { NodeId } from "node-opcua-nodeid";
+import { EventFilter, SimpleAttributeOperand } from "./imports";
+/**
+ * helper to construct event filters:
+ * construct a simple event filter
+ *
+ *
+ * @example
+ *
+ *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
+ *
+ *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
+ *     constructEventFilter(["SourceName","2:MyData" ]);
+ *
+ *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
+ *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
+ *
+ */
+export declare function constructEventFilter(arrayOfNames: string[] | string, conditionTypes?: NodeId[] | NodeId): EventFilter;
+/**
+ * @class SimpleAttributeOperand
+ * @method toShortString
+ * @return {String}
+ *
+ * @example:
+ *
+ *
+ */
+export declare function simpleAttributeOperandToShortString(self: SimpleAttributeOperand, addressSpace: any): string;

package/dist/tools_event_filter.js

@@ -1,158 +1,158 @@
-"use strict";
-/**
- * @module node-opcua-service-filter
- */
-// tslint:disable:object-literal-shorthand
-// tslint:disable:only-arrow-functions
-// tslint:disable:max-line-length
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleAttributeOperandToShortString = exports.constructEventFilter = void 0;
-const node_opcua_constants_1 = require("node-opcua-constants");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const imports_1 = require("./imports");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
-/**
- * helper to construct event filters:
- * construct a simple event filter
- *
- *
- * @example
- *
- *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
- *
- *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
- *     constructEventFilter(["SourceName","2:MyData" ]);
- *
- *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
- *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
- *
- */
-function constructEventFilter(arrayOfNames, conditionTypes) {
-    if (!Array.isArray(arrayOfNames)) {
-        return constructEventFilter([arrayOfNames], conditionTypes);
-    }
-    if (conditionTypes && !Array.isArray(conditionTypes)) {
-        return constructEventFilter(arrayOfNames, [conditionTypes]);
-    }
-    // istanbul ignore next
-    if (!(arrayOfNames instanceof Array)) {
-        throw new Error("internal error");
-    }
-    // replace "string" element in the form A.B.C into [ "A","B","C"]
-    const arrayOfNames2 = arrayOfNames.map((path) => {
-        if (typeof path !== "string") {
-            return path;
-        }
-        return path.split(".");
-    });
-    const arrayOfNames3 = arrayOfNames2.map((path) => {
-        if (Array.isArray(path)) {
-            return path.map(node_opcua_data_model_1.stringToQualifiedName);
-        }
-        return path;
-    });
-    // replace "string" elements in arrayOfName with QualifiedName in namespace 0
-    const arrayOfNames4 = arrayOfNames3.map((s) => {
-        return typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s;
-    });
-    // construct browse paths array
-    const browsePaths = arrayOfNames4.map((s) => {
-        return Array.isArray(s) ? s : [s];
-    });
-    // Part 4 page 127:
-    // In some cases the same BrowsePath will apply to multiple EventTypes. If the Client specifies the BaseEventType
-    // in the SimpleAttributeOperand then the Server shall evaluate the BrowsePath without considering the Type.
-    // [..]
-    // The SimpleAttributeOperand structure allows the Client to specify any Attribute, however, the Server is only
-    // required to support the Value Attribute for Variable Nodes and the NodeId Attribute for Object Nodes.
-    // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
-    let selectClauses = browsePaths.map((browsePath) => {
-        return new imports_1.SimpleAttributeOperand({
-            attributeId: node_opcua_data_model_1.AttributeIds.Value,
-            browsePath,
-            indexRange: undefined,
-            typeDefinitionId: (0, node_opcua_nodeid_1.makeNodeId)(node_opcua_constants_1.ObjectTypeIds.BaseEventType) // i=2041
-        });
-    });
-    if (conditionTypes && conditionTypes instanceof Array) {
-        const extraSelectClauses = conditionTypes.map((nodeId) => {
-            return new imports_1.SimpleAttributeOperand({
-                attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
-                browsePath: undefined,
-                indexRange: undefined,
-                typeDefinitionId: nodeId // conditionType for instance
-            });
-        });
-        selectClauses = selectClauses.concat(extraSelectClauses);
-    }
-    const filter = new imports_1.EventFilter({
-        selectClauses: selectClauses,
-        whereClause: {
-            // ContentFilter
-            elements: [
-            // ContentFilterElement
-            // {
-            //    filterOperator: FilterOperator.IsNull,
-            //    filterOperands: [ //
-            //        new ElementOperand({
-            //            index: 123
-            //        }),
-            //        new AttributeOperand({
-            //            nodeId: "i=10",
-            //            alias: "someText",
-            //            browsePath: { //RelativePath
-            //
-            //            },
-            //            attributeId: AttributeIds.Value
-            //        })
-            //    ]
-            // }
-            ]
-        }
-    });
-    return filter;
-}
-exports.constructEventFilter = constructEventFilter;
-/**
- * @class SimpleAttributeOperand
- * @method toPath
- * @return {String}
- *
- * @example:
- *
- *
- */
-function simpleAttributeOperandToPath(self) {
-    if (!self.browsePath) {
-        return "";
-    }
-    return self.browsePath
-        .map((a) => {
-        return a.name;
-    })
-        .join("/");
-}
-/**
- * @class SimpleAttributeOperand
- * @method toShortString
- * @return {String}
- *
- * @example:
- *
- *
- */
-function simpleAttributeOperandToShortString(self, addressSpace // Address Space
-) {
-    let str = "";
-    if (addressSpace) {
-        const n = addressSpace.findNode(self.typeDefinitionId);
-        str += n.BrowseName.toString();
-    }
-    str += "[" + self.typeDefinitionId.toString() + "]" + simpleAttributeOperandToPath(self);
-    return str;
-}
-exports.simpleAttributeOperandToShortString = simpleAttributeOperandToShortString;
+"use strict";
+/**
+ * @module node-opcua-service-filter
+ */
+// tslint:disable:object-literal-shorthand
+// tslint:disable:only-arrow-functions
+// tslint:disable:max-line-length
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simpleAttributeOperandToShortString = exports.constructEventFilter = void 0;
+const node_opcua_constants_1 = require("node-opcua-constants");
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const imports_1 = require("./imports");
+const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
+const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
+/**
+ * helper to construct event filters:
+ * construct a simple event filter
+ *
+ *
+ * @example
+ *
+ *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
+ *
+ *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
+ *     constructEventFilter(["SourceName","2:MyData" ]);
+ *
+ *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
+ *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
+ *
+ */
+function constructEventFilter(arrayOfNames, conditionTypes) {
+    if (!Array.isArray(arrayOfNames)) {
+        return constructEventFilter([arrayOfNames], conditionTypes);
+    }
+    if (conditionTypes && !Array.isArray(conditionTypes)) {
+        return constructEventFilter(arrayOfNames, [conditionTypes]);
+    }
+    // istanbul ignore next
+    if (!(arrayOfNames instanceof Array)) {
+        throw new Error("internal error");
+    }
+    // replace "string" element in the form A.B.C into [ "A","B","C"]
+    const arrayOfNames2 = arrayOfNames.map((path) => {
+        if (typeof path !== "string") {
+            return path;
+        }
+        return path.split(".");
+    });
+    const arrayOfNames3 = arrayOfNames2.map((path) => {
+        if (Array.isArray(path)) {
+            return path.map(node_opcua_data_model_1.stringToQualifiedName);
+        }
+        return path;
+    });
+    // replace "string" elements in arrayOfName with QualifiedName in namespace 0
+    const arrayOfNames4 = arrayOfNames3.map((s) => {
+        return typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s;
+    });
+    // construct browse paths array
+    const browsePaths = arrayOfNames4.map((s) => {
+        return Array.isArray(s) ? s : [s];
+    });
+    // Part 4 page 127:
+    // In some cases the same BrowsePath will apply to multiple EventTypes. If the Client specifies the BaseEventType
+    // in the SimpleAttributeOperand then the Server shall evaluate the BrowsePath without considering the Type.
+    // [..]
+    // The SimpleAttributeOperand structure allows the Client to specify any Attribute, however, the Server is only
+    // required to support the Value Attribute for Variable Nodes and the NodeId Attribute for Object Nodes.
+    // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
+    let selectClauses = browsePaths.map((browsePath) => {
+        return new imports_1.SimpleAttributeOperand({
+            attributeId: node_opcua_data_model_1.AttributeIds.Value,
+            browsePath,
+            indexRange: undefined,
+            typeDefinitionId: (0, node_opcua_nodeid_1.makeNodeId)(node_opcua_constants_1.ObjectTypeIds.BaseEventType) // i=2041
+        });
+    });
+    if (conditionTypes && conditionTypes instanceof Array) {
+        const extraSelectClauses = conditionTypes.map((nodeId) => {
+            return new imports_1.SimpleAttributeOperand({
+                attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
+                browsePath: undefined,
+                indexRange: undefined,
+                typeDefinitionId: nodeId // conditionType for instance
+            });
+        });
+        selectClauses = selectClauses.concat(extraSelectClauses);
+    }
+    const filter = new imports_1.EventFilter({
+        selectClauses,
+        whereClause: {
+            // ContentFilter
+            elements: [
+            // ContentFilterElement
+            // {
+            //    filterOperator: FilterOperator.IsNull,
+            //    filterOperands: [ //
+            //        new ElementOperand({
+            //            index: 123
+            //        }),
+            //        new AttributeOperand({
+            //            nodeId: "i=10",
+            //            alias: "someText",
+            //            browsePath: { //RelativePath
+            //
+            //            },
+            //            attributeId: AttributeIds.Value
+            //        })
+            //    ]
+            // }
+            ]
+        }
+    });
+    return filter;
+}
+exports.constructEventFilter = constructEventFilter;
+/**
+ * @class SimpleAttributeOperand
+ * @method toPath
+ * @return {String}
+ *
+ * @example:
+ *
+ *
+ */
+function simpleAttributeOperandToPath(self) {
+    if (!self.browsePath) {
+        return "";
+    }
+    return self.browsePath
+        .map((a) => {
+        return a.name;
+    })
+        .join("/");
+}
+/**
+ * @class SimpleAttributeOperand
+ * @method toShortString
+ * @return {String}
+ *
+ * @example:
+ *
+ *
+ */
+function simpleAttributeOperandToShortString(self, addressSpace // Address Space
+) {
+    let str = "";
+    if (addressSpace) {
+        const n = addressSpace.findNode(self.typeDefinitionId);
+        str += n.BrowseName.toString();
+    }
+    str += "[" + self.typeDefinitionId.toString() + "]" + simpleAttributeOperandToPath(self);
+    return str;
+}
+exports.simpleAttributeOperandToShortString = simpleAttributeOperandToShortString;
 //# sourceMappingURL=tools_event_filter.js.map

package/dist/tools_event_filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,0CAA0C;AAC1C,sCAAsC;AACtC,iCAAiC;;;AAGjC,+DAAqD;AACrD,iEAA4E;AAC5E,uDAAiE;AACjE,yDAAkF;AAGlF,uCAAgE;AAEhE,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAE3C;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,oBAAoB,CAAC,YAA+B,EAAE,cAAkC;IACpG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC9B,OAAO,oBAAoB,CAAC,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC;KAC/D;IACD,IAAI,cAAc,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAClD,OAAO,oBAAoB,CAAC,YAAY,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;KAC/D;IACD,uBAAuB;IACvB,IAAI,CAAC,CAAC,YAAY,YAAY,KAAK,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;KACrC;IACD,iEAAiE;IACjE,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC,GAAG,CAAC,6CAAqB,CAAC,CAAC;SAC1C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,6EAA6E;IAC7E,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1C,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,6CAAqB,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,+BAA+B;IAC/B,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACxC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,mBAAmB;IACnB,iHAAiH;IACjH,4GAA4G;IAE5G,OAAO;IACP,+GAA+G;IAC/G,wGAAwG;IACxG,8FAA8F;IAC9F,IAAI,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC/C,OAAO,IAAI,gCAAsB,CAAC;YAC9B,WAAW,EAAE,oCAAY,CAAC,KAAK;YAC/B,UAAU;YACV,UAAU,EAAE,SAAS;YACrB,gBAAgB,EAAE,IAAA,8BAAU,EAAC,oCAAa,CAAC,aAAa,CAAC,CAAC,SAAS;SACtE,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,cAAc,IAAI,cAAc,YAAY,KAAK,EAAE;QACnD,MAAM,kBAAkB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACrD,OAAO,IAAI,gCAAsB,CAAC;gBAC9B,WAAW,EAAE,oCAAY,CAAC,MAAM;gBAChC,UAAU,EAAE,SAAS;gBACrB,UAAU,EAAE,SAAS;gBACrB,gBAAgB,EAAE,MAAM,CAAC,6BAA6B;aACzD,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;KAC5D;IAED,MAAM,MAAM,GAAG,IAAI,qBAAW,CAAC;QAC3B,aAAa;QACb,WAAW,EAAE;YACT,gBAAgB;YAChB,QAAQ,EAAE;YACN,uBAAuB;YACvB,IAAI;YACJ,4CAA4C;YAC5C,0BAA0B;YAC1B,8BAA8B;YAC9B,wBAAwB;YACxB,aAAa;YACb,gCAAgC;YAChC,6BAA6B;YAC7B,gCAAgC;YAChC,0CAA0C;YAC1C,EAAE;YACF,gBAAgB;YAChB,6CAA6C;YAC7C,YAAY;YACZ,OAAO;YACP,IAAI;aACP;SACJ;KACJ,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC;AA1FD,oDA0FC;AAED;;;;;;;;GAQG;AACH,SAAS,4BAA4B,CAAC,IAA4B;IAC9D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;QAClB,OAAO,EAAE,CAAC;KACb;IACD,OAAO,IAAI,CAAC,UAAU;SACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACP,OAAO,CAAC,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,mCAAmC,CAC/C,IAA4B,EAC5B,YAAiB,CAAC,gBAAgB;;IAElC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,YAAY,EAAE;QACd,MAAM,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAE,CAAC;QACxD,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;KAClC;IACD,GAAG,IAAI,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACzF,OAAO,GAAG,CAAC;AACf,CAAC;AAXD,kFAWC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-service-filter",
-    "version": "2.71.0",
+    "version": "2.72.2",
     "description": "pure nodejs OPCUA SDK - module -service-filter",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -11,21 +11,21 @@
     },
     "dependencies": {
         "node-opcua-assert": "2.66.0",
-        "node-opcua-basic-types": "2.71.0",
+        "node-opcua-basic-types": "2.72.1",
         "node-opcua-binary-stream": "2.71.0",
         "node-opcua-constants": "2.70.0",
-        "node-opcua-data-model": "2.71.0",
+        "node-opcua-data-model": "2.72.1",
         "node-opcua-debug": "2.71.0",
-        "node-opcua-factory": "2.71.0",
+        "node-opcua-factory": "2.72.1",
         "node-opcua-nodeid": "2.71.0",
-        "node-opcua-numeric-range": "2.71.0",
-        "node-opcua-service-translate-browse-path": "2.71.0",
+        "node-opcua-numeric-range": "2.72.2",
+        "node-opcua-service-translate-browse-path": "2.72.2",
         "node-opcua-status-code": "2.71.0",
-        "node-opcua-types": "2.71.0",
-        "node-opcua-variant": "2.71.0"
+        "node-opcua-types": "2.72.2",
+        "node-opcua-variant": "2.72.2"
     },
     "devDependencies": {
-        "node-opcua-service-secure-channel": "2.71.0",
+        "node-opcua-service-secure-channel": "2.72.2",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -43,5 +43,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "10f7cc1e1cd30dfef75adad9cb709a78401fabf3"
+    "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c"
 }

package/source/tools_event_filter.ts

@@ -98,8 +98,7 @@ export function constructEventFilter(arrayOfNames: string[] | string, conditionT
     }
 
     const filter = new EventFilter({
-        selectClauses: selectClauses,
-
+        selectClauses,
         whereClause: {
             // ContentFilter
             elements: [