node-opcua-service-filter - npm Package Compare versions

Comparing version 0.2.3 to 0.3.0

_generated_/_auto_generated_AttributeOperand.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.443Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.692Z
 "use strict";
@@ -6,24 +6,24 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/AttributeOperand_schema").AttributeOperand_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var RelativePath = getFactory("RelativePath");
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
-var FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/AttributeOperand_schema").AttributeOperand_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const RelativePath = getFactory("RelativePath");
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
 
@@ -36,7 +36,2 @@ /**
  * @param  options {Object}
- * @param  [options.nodeId] {NodeId} NodeId of a Node from the type system.
- * @param  [options.alias] {String} An optional parameter used to identify or refer to an alias. An alias is a symbolic name that can be used to alias this operand and use it in other locations in the filter structure.
- * @param  [options.browsePath] {RelativePath} Browse path relative to the Node identified by the nodeId parameter.
- * @param  [options.attributeId] {IntegerId} 
- * @param  [options.indexRange] {NumericRange} 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).
  */
@@ -48,3 +43,3 @@ function AttributeOperand(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -102,10 +97,10 @@ resolve_schema_field_types(schema);
 
-var encode_NodeId = _defaultTypeMap.NodeId.encode;
-var decode_NodeId = _defaultTypeMap.NodeId.decode;
-var encode_String = _defaultTypeMap.String.encode;
-var decode_String = _defaultTypeMap.String.decode;
-var encode_IntegerId = _defaultTypeMap.IntegerId.encode;
-var decode_IntegerId = _defaultTypeMap.IntegerId.decode;
-var encode_NumericRange = _defaultTypeMap.NumericRange.encode;
-var decode_NumericRange = _defaultTypeMap.NumericRange.decode;
+const encode_NodeId = _defaultTypeMap.NodeId.encode;
+const decode_NodeId = _defaultTypeMap.NodeId.decode;
+const encode_String = _defaultTypeMap.String.encode;
+const decode_String = _defaultTypeMap.String.decode;
+const encode_IntegerId = _defaultTypeMap.IntegerId.encode;
+const decode_IntegerId = _defaultTypeMap.IntegerId.decode;
+const encode_NumericRange = _defaultTypeMap.NumericRange.encode;
+const decode_NumericRange = _defaultTypeMap.NumericRange.decode;
 /**
@@ -131,12 +126,11 @@ * encode the object into a binary stream
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-AttributeOperand.prototype.decode = function(stream,options) {
+AttributeOperand.prototype.decode = function(stream) {
     // call base class implementation first
-    FilterOperand.prototype.decode.call(this,stream,options);
-    this.nodeId = decode_NodeId(stream,options);
-    this.alias = decode_String(stream,options);
-    this.browsePath.decode(stream,options);
-    this.attributeId = decode_IntegerId(stream,options);
-    this.indexRange = decode_NumericRange(stream,options);
+    FilterOperand.prototype.decode.call(this,stream);
+    this.nodeId = decode_NodeId(stream);
+    this.alias = decode_String(stream);
+    this.browsePath.decode(stream);
+    this.attributeId = decode_IntegerId(stream);
+    this.indexRange = decode_NumericRange(stream);
 };
@@ -153,3 +147,3 @@ AttributeOperand.possibleFields = [
 exports.AttributeOperand = AttributeOperand;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("AttributeOperand",AttributeOperand);

_generated_/_auto_generated_ContentFilter.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.465Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.720Z
 "use strict";
@@ -6,23 +6,23 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/ContentFilter_schema").ContentFilter_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var ContentFilterElement = require("./_auto_generated_ContentFilterElement").ContentFilterElement;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/ContentFilter_schema").ContentFilter_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const ContentFilterElement = require("./_auto_generated_ContentFilterElement").ContentFilterElement;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
 
@@ -35,3 +35,2 @@ /**
  * @param  options {Object}
- * @param  [options.elements] {ContentFilterElement[]} 
  */
@@ -43,3 +42,3 @@ function ContentFilter(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -89,10 +88,9 @@ resolve_schema_field_types(schema);
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-ContentFilter.prototype.decode = function(stream,options) {
+ContentFilter.prototype.decode = function(stream) {
     // call base class implementation first
-    BaseUAObject.prototype.decode.call(this,stream,options);
+    BaseUAObject.prototype.decode.call(this,stream);
     this.elements = decodeArray(stream, function(stream) { 
-       var obj = new ContentFilterElement(null);
-       obj.decode(stream,options);
+       const obj = new ContentFilterElement(null);
+       obj.decode(stream);
        return obj; 
@@ -107,3 +105,3 @@ });
 exports.ContentFilter = ContentFilter;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("ContentFilter",ContentFilter);

_generated_/_auto_generated_ContentFilterElement.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.457Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.709Z
 "use strict";
@@ -6,22 +6,22 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/ContentFilterElement_schema").ContentFilterElement_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/ContentFilterElement_schema").ContentFilterElement_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
 
@@ -34,4 +34,2 @@ /**
  * @param  options {Object}
- * @param  [options.filterOperator] {FilterOperator} 
- * @param  [options.filterOperands] {ExtensionObject[]} 
  */
@@ -43,3 +41,3 @@ function ContentFilterElement(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -74,3 +72,3 @@ resolve_schema_field_types(schema);
 ContentFilterElement.prototype.setFilterOperator = function(value) {
-   var coercedValue = _enumerations.FilterOperator.typedEnum.get(value);
+   const coercedValue = _enumerations.FilterOperator.typedEnum.get(value);
    /* istanbul ignore next */
@@ -86,6 +84,6 @@ if (coercedValue === undefined || coercedValue === null) {
 
-var encode_FilterOperator = _enumerations.FilterOperator.encode;
-var decode_FilterOperator = _enumerations.FilterOperator.decode;
-var encode_ExtensionObject = _defaultTypeMap.ExtensionObject.encode;
-var decode_ExtensionObject = _defaultTypeMap.ExtensionObject.decode;
+const encode_FilterOperator = _enumerations.FilterOperator.encode;
+const decode_FilterOperator = _enumerations.FilterOperator.decode;
+const encode_ExtensionObject = _defaultTypeMap.ExtensionObject.encode;
+const decode_ExtensionObject = _defaultTypeMap.ExtensionObject.decode;
 /**
@@ -108,8 +106,7 @@ * encode the object into a binary stream
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-ContentFilterElement.prototype.decode = function(stream,options) {
+ContentFilterElement.prototype.decode = function(stream) {
     // call base class implementation first
-    BaseUAObject.prototype.decode.call(this,stream,options);
-    this.filterOperator = decode_FilterOperator(stream,options);
+    BaseUAObject.prototype.decode.call(this,stream);
+    this.filterOperator = decode_FilterOperator(stream);
     this.filterOperands = decodeArray(stream, decode_ExtensionObject);
@@ -124,3 +121,3 @@ };
 exports.ContentFilterElement = ContentFilterElement;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("ContentFilterElement",ContentFilterElement);

_generated_/_auto_generated_ElementOperand.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.316Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.564Z
 "use strict";
@@ -6,23 +6,23 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/ElementOperand_schema").ElementOperand_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
-var FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/ElementOperand_schema").ElementOperand_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
 
@@ -35,3 +35,2 @@ /**
  * @param  options {Object}
- * @param  [options.index] {UInt32} Index into the element array
  */
@@ -43,3 +42,3 @@ function ElementOperand(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -68,4 +67,4 @@ resolve_schema_field_types(schema);
 
-var encode_UInt32 = _defaultTypeMap.UInt32.encode;
-var decode_UInt32 = _defaultTypeMap.UInt32.decode;
+const encode_UInt32 = _defaultTypeMap.UInt32.encode;
+const decode_UInt32 = _defaultTypeMap.UInt32.decode;
 /**
@@ -87,8 +86,7 @@ * encode the object into a binary stream
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-ElementOperand.prototype.decode = function(stream,options) {
+ElementOperand.prototype.decode = function(stream) {
     // call base class implementation first
-    FilterOperand.prototype.decode.call(this,stream,options);
-    this.index = decode_UInt32(stream,options);
+    FilterOperand.prototype.decode.call(this,stream);
+    this.index = decode_UInt32(stream);
 };
@@ -101,3 +99,3 @@ ElementOperand.possibleFields = [
 exports.ElementOperand = ElementOperand;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("ElementOperand",ElementOperand);

_generated_/_auto_generated_EventFilter.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.472Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.727Z
 "use strict";
@@ -6,25 +6,25 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/EventFilter_schema").EventFilter_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var SimpleAttributeOperand = require("./_auto_generated_SimpleAttributeOperand").SimpleAttributeOperand;
-var ContentFilter = require("./_auto_generated_ContentFilter").ContentFilter;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
-var MonitoringFilter = require("./_auto_generated_MonitoringFilter").MonitoringFilter;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/EventFilter_schema").EventFilter_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const SimpleAttributeOperand = require("./_auto_generated_SimpleAttributeOperand").SimpleAttributeOperand;
+const ContentFilter = require("./_auto_generated_ContentFilter").ContentFilter;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const MonitoringFilter = require("./_auto_generated_MonitoringFilter").MonitoringFilter;
 
@@ -37,4 +37,2 @@ /**
  * @param  options {Object}
- * @param  [options.selectClauses] {SimpleAttributeOperand[]} 
- * @param  [options.whereClause] {ContentFilter} 
  */
@@ -46,3 +44,3 @@ function EventFilter(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -101,13 +99,12 @@ resolve_schema_field_types(schema);
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-EventFilter.prototype.decode = function(stream,options) {
+EventFilter.prototype.decode = function(stream) {
     // call base class implementation first
-    MonitoringFilter.prototype.decode.call(this,stream,options);
+    MonitoringFilter.prototype.decode.call(this,stream);
     this.selectClauses = decodeArray(stream, function(stream) { 
-       var obj = new SimpleAttributeOperand(null);
-       obj.decode(stream,options);
+       const obj = new SimpleAttributeOperand(null);
+       obj.decode(stream);
        return obj; 
     });
-    this.whereClause.decode(stream,options);
+    this.whereClause.decode(stream);
 };
@@ -121,3 +118,3 @@ EventFilter.possibleFields = [
 exports.EventFilter = EventFilter;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("EventFilter",EventFilter);

_generated_/_auto_generated_FilterOperand.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.281Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.524Z
 "use strict";
@@ -6,22 +6,22 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/FilterOperand_schema").FilterOperand_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/FilterOperand_schema").FilterOperand_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
 
@@ -40,3 +40,3 @@ /**
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -73,7 +73,6 @@ resolve_schema_field_types(schema);
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-FilterOperand.prototype.decode = function(stream,options) {
+FilterOperand.prototype.decode = function(stream) {
     // call base class implementation first
-    BaseUAObject.prototype.decode.call(this,stream,options);
+    BaseUAObject.prototype.decode.call(this,stream);
 };
@@ -86,3 +85,3 @@ FilterOperand.possibleFields = [
 exports.FilterOperand = FilterOperand;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("FilterOperand",FilterOperand);

_generated_/_auto_generated_LiteralOperand.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.356Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.611Z
 "use strict";
@@ -6,24 +6,24 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/LiteralOperand_schema").LiteralOperand_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var Variant = getFactory("Variant");
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
-var FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/LiteralOperand_schema").LiteralOperand_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const Variant = getFactory("Variant");
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
 
@@ -36,3 +36,2 @@ /**
  * @param  options {Object}
- * @param  [options.value] {Variant} A literal value.
  */
@@ -44,3 +43,3 @@ function LiteralOperand(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -86,8 +85,7 @@ resolve_schema_field_types(schema);
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-LiteralOperand.prototype.decode = function(stream,options) {
+LiteralOperand.prototype.decode = function(stream) {
     // call base class implementation first
-    FilterOperand.prototype.decode.call(this,stream,options);
-    this.value.decode(stream,options);
+    FilterOperand.prototype.decode.call(this,stream);
+    this.value.decode(stream);
 };
@@ -100,3 +98,3 @@ LiteralOperand.possibleFields = [
 exports.LiteralOperand = LiteralOperand;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("LiteralOperand",LiteralOperand);

_generated_/_auto_generated_MonitoringFilter.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.257Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.494Z
 "use strict";
@@ -6,22 +6,22 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/MonitoringFilter_schema").MonitoringFilter_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/MonitoringFilter_schema").MonitoringFilter_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
 
@@ -40,3 +40,3 @@ /**
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -73,7 +73,6 @@ resolve_schema_field_types(schema);
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-MonitoringFilter.prototype.decode = function(stream,options) {
+MonitoringFilter.prototype.decode = function(stream) {
     // call base class implementation first
-    BaseUAObject.prototype.decode.call(this,stream,options);
+    BaseUAObject.prototype.decode.call(this,stream);
 };
@@ -86,3 +85,3 @@ MonitoringFilter.possibleFields = [
 exports.MonitoringFilter = MonitoringFilter;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("MonitoringFilter",MonitoringFilter);

_generated_/_auto_generated_SimpleAttributeOperand.js

@@ -1,2 +0,2 @@
-// --------- This code has been automatically generated !!! 2018-02-08T07:25:25.308Z
+// --------- This code has been automatically generated !!! 2018-04-16T04:56:45.552Z
 "use strict";
@@ -6,24 +6,24 @@ /**
  */
-var assert = require("node-opcua-assert");
-var util = require("util");
-var _  = require("underscore");
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
-var extract_all_fields                       = schema_helpers.extract_all_fields;
-var resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
-var initialize_field                         = schema_helpers.initialize_field;
-var initialize_field_array                   = schema_helpers.initialize_field_array;
-var check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
-var _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
-var ec = require("node-opcua-basic-types");
-var encodeArray = ec.encodeArray;
-var decodeArray = ec.decodeArray;
-var makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
-var generate_new_id = require("node-opcua-factory").generate_new_id;
-var _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
-var schema = require("../schemas/SimpleAttributeOperand_schema").SimpleAttributeOperand_Schema;
-var getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
-var QualifiedName = getFactory("QualifiedName");
-var BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
-var FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
+const assert = require("node-opcua-assert").assert;
+const util = require("util");
+const _  = require("underscore");
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const schema_helpers =  require("node-opcua-factory/src/factories_schema_helpers");
+const extract_all_fields                       = schema_helpers.extract_all_fields;
+const resolve_schema_field_types               = schema_helpers.resolve_schema_field_types;
+const initialize_field                         = schema_helpers.initialize_field;
+const initialize_field_array                   = schema_helpers.initialize_field_array;
+const check_options_correctness_against_schema = schema_helpers.check_options_correctness_against_schema;
+const _defaultTypeMap = require("node-opcua-factory/src/factories_builtin_types")._defaultTypeMap;
+const ec = require("node-opcua-basic-types");
+const encodeArray = ec.encodeArray;
+const decodeArray = ec.decodeArray;
+const makeExpandedNodeId = require("node-opcua-nodeid/src/expanded_nodeid").makeExpandedNodeId;
+const generate_new_id = require("node-opcua-factory").generate_new_id;
+const _enumerations = require("node-opcua-factory/src/factories_enumerations")._private._enumerations;
+const schema = require("../schemas/SimpleAttributeOperand_schema").SimpleAttributeOperand_Schema;
+const getFactory = require("node-opcua-factory/src/factories_factories").getFactory;
+const QualifiedName = getFactory("QualifiedName");
+const BaseUAObject = require("node-opcua-factory/src/factories_baseobject").BaseUAObject;
+const FilterOperand = require("./_auto_generated_FilterOperand").FilterOperand;
 
@@ -36,6 +36,2 @@ /**
  * @param  options {Object}
- * @param  [options.typeId] {NodeId} NodeId of a TypeDefinitionNode.
- * @param  [options.browsePath] {QualifiedName[]} 
- * @param  [options.attributeId] {IntegerId} 
- * @param  [options.indexRange] {NumericRange} 
  */
@@ -47,3 +43,3 @@ function SimpleAttributeOperand(options)
     if (schema_helpers.doDebug) { check_options_correctness_against_schema(this,schema,options); }
-    var self = this;
+    const self = this;
     assert(this instanceof BaseUAObject); //  ' keyword "new" is required for constructor call')
@@ -98,8 +94,8 @@ resolve_schema_field_types(schema);
 
-var encode_NodeId = _defaultTypeMap.NodeId.encode;
-var decode_NodeId = _defaultTypeMap.NodeId.decode;
-var encode_IntegerId = _defaultTypeMap.IntegerId.encode;
-var decode_IntegerId = _defaultTypeMap.IntegerId.decode;
-var encode_NumericRange = _defaultTypeMap.NumericRange.encode;
-var decode_NumericRange = _defaultTypeMap.NumericRange.decode;
+const encode_NodeId = _defaultTypeMap.NodeId.encode;
+const decode_NodeId = _defaultTypeMap.NodeId.decode;
+const encode_IntegerId = _defaultTypeMap.IntegerId.encode;
+const decode_IntegerId = _defaultTypeMap.IntegerId.decode;
+const encode_NumericRange = _defaultTypeMap.NumericRange.encode;
+const decode_NumericRange = _defaultTypeMap.NumericRange.decode;
 /**
@@ -124,15 +120,14 @@ * encode the object into a binary stream
  * @param stream {BinaryStream} 
- * @param [option] {object} 
  */
-SimpleAttributeOperand.prototype.decode = function(stream,options) {
+SimpleAttributeOperand.prototype.decode = function(stream) {
     // call base class implementation first
-    FilterOperand.prototype.decode.call(this,stream,options);
-    this.typeId = decode_NodeId(stream,options);
+    FilterOperand.prototype.decode.call(this,stream);
+    this.typeId = decode_NodeId(stream);
     this.browsePath = decodeArray(stream, function(stream) { 
-       var obj = new QualifiedName(null);
-       obj.decode(stream,options);
+       const obj = new QualifiedName(null);
+       obj.decode(stream);
        return obj; 
     });
-    this.attributeId = decode_IntegerId(stream,options);
-    this.indexRange = decode_NumericRange(stream,options);
+    this.attributeId = decode_IntegerId(stream);
+    this.indexRange = decode_NumericRange(stream);
 };
@@ -148,3 +143,3 @@ SimpleAttributeOperand.possibleFields = [
 exports.SimpleAttributeOperand = SimpleAttributeOperand;
-var register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
+const register_class_definition = require("node-opcua-factory/src/factories_factories").register_class_definition;
 register_class_definition("SimpleAttributeOperand",SimpleAttributeOperand);

package.json

 {
  "name": "node-opcua-service-filter",
- "version": "0.2.3",
+ "version": "0.3.0",
  "description": "pure nodejs OPCUA SDK - module -service-filter",
@@ -12,18 +12,18 @@ "main": "./index.js",
  "dependencies": {
-  "node-opcua-assert": "^0.2.0",
-  "node-opcua-basic-types": "^0.2.3",
+  "node-opcua-assert": "^0.3.0",
+  "node-opcua-basic-types": "^0.3.0",
   "node-opcua-constants": "^0.2.0",
-  "node-opcua-data-model": "^0.2.3",
-  "node-opcua-debug": "^0.2.2",
-  "node-opcua-factory": "^0.2.3",
-  "node-opcua-nodeid": "^0.2.3",
-  "node-opcua-numeric-range": "^0.2.3",
-  "node-opcua-service-translate-browse-path": "^0.2.3",
-  "node-opcua-status-code": "^0.2.3",
-  "node-opcua-variant": "^0.2.3",
+  "node-opcua-data-model": "^0.3.0",
+  "node-opcua-debug": "^0.3.0",
+  "node-opcua-factory": "^0.3.0",
+  "node-opcua-nodeid": "^0.3.0",
+  "node-opcua-numeric-range": "^0.3.0",
+  "node-opcua-service-translate-browse-path": "^0.3.0",
+  "node-opcua-status-code": "^0.3.0",
+  "node-opcua-variant": "^0.3.0",
   "underscore": "^1.8.3"
  },
  "devDependencies": {
-  "node-opcua-generator": "^0.2.3",
-  "node-opcua-service-secure-channel": "^0.2.3",
+  "node-opcua-generator": "^0.3.0",
+  "node-opcua-service-secure-channel": "^0.3.0",
   "should": "13.2.1"
@@ -30,0 +30,0 @@ },

schemas/AttributeOperand_schema.js

 "use strict";
 require("node-opcua-service-translate-browse-path");
-var NumericRange = require("node-opcua-numeric-range").NumericRange;
+const NumericRange = require("node-opcua-numeric-range").NumericRange;
 
-var AttributeOperand_Schema = {
+const AttributeOperand_Schema = {
     name:"AttributeOperand",
@@ -7,0 +7,0 @@ baseType:"FilterOperand",

schemas/ContentFilter_schema.js

 
 
-var ContentFilter_Schema = {
+const ContentFilter_Schema = {
     name: "ContentFilter",
@@ -5,0 +5,0 @@ fields: [

schemas/ContentFilterElement_schema.js

@@ -15,3 +15,3 @@ "use strict";
 
-var ContentFilterElement_Schema = {
+const ContentFilterElement_Schema = {
     name: "ContentFilterElement",
@@ -18,0 +18,0 @@ fields: [

schemas/ElementOperand_schema.js

@@ -9,3 +9,3 @@
 // using it.
-var ElementOperand_Schema = {
+const ElementOperand_Schema = {
     name:"ElementOperand",
@@ -12,0 +12,0 @@ baseType:"FilterOperand",

schemas/EventFilter_schema.js

 
-var EventFilter_Schema = {
+const EventFilter_Schema = {
     name: "EventFilter",
@@ -4,0 +4,0 @@ baseType: "MonitoringFilter",

schemas/FilterOperand_schema.js

 
-var FilterOperand_Schema = {
+const FilterOperand_Schema = {
     name: "FilterOperand",
@@ -4,0 +4,0 @@ //xx baseType:"ExtensionObject",

schemas/FilterOperator_enum.js

 "use strict";
 
-var factories = require("node-opcua-factory");
+const factories = require("node-opcua-factory");
 // OPC Unified Architecture, Part 4 Release 1.02 page 115
-var FilterOperator_Schema = {
+const FilterOperator_Schema = {
 
@@ -7,0 +7,0 @@ name: "FilterOperator",

schemas/LiteralOperand_schema.js

 require("node-opcua-variant");
 
-var LiteralOperand_Schema = {
+const LiteralOperand_Schema = {
     name:"LiteralOperand",
@@ -5,0 +5,0 @@ baseType:"FilterOperand",

schemas/MonitoringFilter_schema.js

 
-var MonitoringFilter_Schema = {
+const MonitoringFilter_Schema = {
     name: "MonitoringFilter",
@@ -4,0 +4,0 @@ //xx baseType:"ExtensionObject",

schemas/SimpleAttributeOperand_schema.js

@@ -1,2 +0,2 @@
-var NumericRange = require("node-opcua-numeric-range").NumericRange;
+const NumericRange = require("node-opcua-numeric-range").NumericRange;
 // The SimpleAttributeOperand is a simplified form of the AttributeOperand and all of the rules that
@@ -7,3 +7,3 @@ // apply to the AttributeOperand also apply to the SimpleAttributeOperand. The examples provided in
 // HierarchicalReferences and the targets are Object or Variable Nodes and an Alias is not required
-var SimpleAttributeOperand_Schema = {
+const SimpleAttributeOperand_Schema = {
 
@@ -10,0 +10,0 @@ name:"SimpleAttributeOperand",

src/tools_event_filter.js

@@ -7,23 +7,23 @@ "use strict";
 
-var assert = require("node-opcua-assert");
+const assert = require("node-opcua-assert").assert;
 
-var SimpleAttributeOperand = require("../_generated_/_auto_generated_SimpleAttributeOperand").SimpleAttributeOperand;
-var EventFilter = require("../_generated_/_auto_generated_EventFilter").EventFilter;
-var StatusCodes = require("node-opcua-status-code").StatusCodes;
-var DataType = require("node-opcua-variant").DataType;
+const SimpleAttributeOperand = require("../_generated_/_auto_generated_SimpleAttributeOperand").SimpleAttributeOperand;
+const EventFilter = require("../_generated_/_auto_generated_EventFilter").EventFilter;
+const StatusCodes = require("node-opcua-status-code").StatusCodes;
+const DataType = require("node-opcua-variant").DataType;
 
 
 
-var makeNodeId = require("node-opcua-nodeid").makeNodeId;
-var _ = require("underscore");
-var ObjectTypeIds = require("node-opcua-constants").ObjectTypeIds;
-var AttributeIds = require("node-opcua-data-model").AttributeIds;
-var stringToQualifiedName = require("node-opcua-data-model").stringToQualifiedName;
+const makeNodeId = require("node-opcua-nodeid").makeNodeId;
+const _ = require("underscore");
+const ObjectTypeIds = require("node-opcua-constants").ObjectTypeIds;
+const AttributeIds = require("node-opcua-data-model").AttributeIds;
+const stringToQualifiedName = require("node-opcua-data-model").stringToQualifiedName;
 
-var Variant = require("node-opcua-variant").Variant;
-var NodeId = require("node-opcua-nodeid").NodeId;
-var resolveNodeId = require("node-opcua-nodeid").resolveNodeId;
-var sameNodeId = require("node-opcua-nodeid").sameNodeId;
-var debugLog = require("node-opcua-debug").make_debugLog(__filename);
-var doDebug = require("node-opcua-debug").checkDebugFlag(__filename);
+const Variant = require("node-opcua-variant").Variant;
+const NodeId = require("node-opcua-nodeid").NodeId;
+const resolveNodeId = require("node-opcua-nodeid").resolveNodeId;
+const sameNodeId = require("node-opcua-nodeid").sameNodeId;
+const debugLog = require("node-opcua-debug").make_debugLog(__filename);
+const doDebug = require("node-opcua-debug").checkDebugFlag(__filename);
 
@@ -80,3 +80,3 @@ /**
     // construct browse paths array
-    var browsePaths = arrayOfNames.map(function (s) {
+    const browsePaths = arrayOfNames.map(function (s) {
         return _.isArray(s) ? s : [s];
@@ -93,3 +93,3 @@ });
     // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
-    var selectClauses = browsePaths.map(function (browsePath) {
+    let selectClauses = browsePaths.map(function (browsePath) {
         return new SimpleAttributeOperand({
@@ -104,3 +104,3 @@ typeId: makeNodeId(ObjectTypeIds.BaseEventType), // i=2041
     if (conditionTypes) {
-        var extraSelectClauses = conditionTypes.map(function(nodeId) {
+        const extraSelectClauses = conditionTypes.map(function(nodeId) {
             return new SimpleAttributeOperand({
@@ -117,3 +117,3 @@ typeId: nodeId, // conditionType for instance
 
-    var filter = new EventFilter({
+    const filter = new EventFilter({
 
@@ -164,3 +164,3 @@ selectClauses: selectClauses,
 SimpleAttributeOperand.prototype.toPath = function() {
-    var self = this;
+    const self = this;
     return self.browsePath.map(function (a) {
@@ -183,6 +183,6 @@ return a.name;
 
-    var self = this;
-    var str ="";
+    const self = this;
+    let str ="";
     if (addressSpace) {
-        var n = addressSpace.findNode( self.typeId);
+        const n = addressSpace.findNode( self.typeId);
         str += n.BrowseName.toString()
@@ -247,6 +247,6 @@ }
 
-    var handle = eventData.resolveSelectClause(selectClause);
+    const handle = eventData.resolveSelectClause(selectClause);
 
     if (handle !== null) {
-        var value = eventData.readValue(handle,selectClause);
+        const value = eventData.readValue(handle,selectClause);
         assert(value instanceof Variant);
@@ -264,3 +264,2 @@ return value;
     }
-    //xx var innerNode =
 }
@@ -267,0 +266,0 @@

test/test_tools_event_filter.js

 "use strict";
 
-var should = require("should");
-var constructEventFilter = require("..").constructEventFilter;
+const should = require("should");
+const constructEventFilter = require("..").constructEventFilter;
 
-var AttributeIds = require("node-opcua-data-model").AttributeIds;
-var coerceNodeId = require("node-opcua-nodeid").coerceNodeId;
+const AttributeIds = require("node-opcua-data-model").AttributeIds;
+const coerceNodeId = require("node-opcua-nodeid").coerceNodeId;
 
@@ -14,3 +14,3 @@ describe("test constructEventFilter", function () {
 
-        var ef = constructEventFilter("2:SourceName");
+        const ef = constructEventFilter("2:SourceName");
 
@@ -29,3 +29,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter(["SourceName"]);
+        const ef = constructEventFilter(["SourceName"]);
 
@@ -44,3 +44,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter(["SourceName", "Time"]);
+        const ef = constructEventFilter(["SourceName", "Time"]);
 
@@ -67,3 +67,3 @@ ef.selectClauses.length.should.eql(2);
 
-        var ef = constructEventFilter(["2:SourceName"]);
+        const ef = constructEventFilter(["2:SourceName"]);
 
@@ -82,3 +82,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter([{namespaceIndex: 2, name: "SourceName"}]);
+        const ef = constructEventFilter([{namespaceIndex: 2, name: "SourceName"}]);
 
@@ -96,3 +96,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter({namespaceIndex: 2, name: "SourceName"});
+        const ef = constructEventFilter({namespaceIndex: 2, name: "SourceName"});
 
@@ -111,3 +111,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter("2:Component1.3:Property1");
+        const ef = constructEventFilter("2:Component1.3:Property1");
 
@@ -129,3 +129,3 @@ ef.selectClauses.length.should.eql(1);
 
-        var ef = constructEventFilter([["2:Component1", "3:Property1"]]);
+        const ef = constructEventFilter([["2:Component1", "3:Property1"]]);
 
@@ -150,3 +150,3 @@ //xx console.log(ef.toString());
 
-        var ef = constructEventFilter([],[coerceNodeId("i=9999")]);
+        const ef = constructEventFilter([],[coerceNodeId("i=9999")]);
 
@@ -153,0 +153,0 @@ ef.selectClauses.length.should.eql(1);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

80878

decreased by-1.45%

Lines of code

1653

decreased by-1.55%

Dependency changes

• + Addedansi-styles@3.2.1(transitive)

• + Addedchalk@2.4.2(transitive)

• + Addedcolor-convert@1.9.3(transitive)

• + Addedcolor-name@1.1.3(transitive)

• + Addedescape-string-regexp@1.0.5(transitive)

• + Addedhas-flag@3.0.0(transitive)

• + Addednode-opcua-assert@0.3.0(transitive)

• + Addednode-opcua-basic-types@0.3.0(transitive)

• + Addednode-opcua-binary-stream@0.3.0(transitive)

• + Addednode-opcua-buffer-utils@0.3.0(transitive)

• + Addednode-opcua-data-model@0.3.0(transitive)

• + Addednode-opcua-date-time@0.3.0(transitive)

• + Addednode-opcua-debug@0.3.0(transitive)

• + Addednode-opcua-enum@0.3.0(transitive)

• + Addednode-opcua-extension-object@0.3.0(transitive)

• + Addednode-opcua-factory@0.3.0(transitive)

• + Addednode-opcua-guid@0.3.0(transitive)

• + Addednode-opcua-nodeid@0.3.0(transitive)

• + Addednode-opcua-numeric-range@0.3.0(transitive)

• + Addednode-opcua-service-secure-channel@0.3.0(transitive)

• + Addednode-opcua-service-translate-browse-path@0.3.0(transitive)

• + Addednode-opcua-status-code@0.3.0(transitive)

• + Addednode-opcua-utils@0.3.0(transitive)

• + Addednode-opcua-variant@0.3.0(transitive)

• + Addedsupports-color@5.5.0(transitive)

• - Removednode-opcua-assert@0.2.0(transitive)

• - Removednode-opcua-basic-types@0.2.3(transitive)

• - Removednode-opcua-binary-stream@0.2.3(transitive)

• - Removednode-opcua-buffer-utils@0.2.0(transitive)

• - Removednode-opcua-data-model@0.2.3(transitive)

• - Removednode-opcua-date-time@0.2.3(transitive)

• - Removednode-opcua-debug@0.2.2(transitive)

• - Removednode-opcua-enum@0.2.3(transitive)

• - Removednode-opcua-extension-object@0.2.3(transitive)

• - Removednode-opcua-factory@0.2.3(transitive)

• - Removednode-opcua-guid@0.2.0(transitive)

• - Removednode-opcua-nodeid@0.2.3(transitive)

• - Removednode-opcua-numeric-range@0.2.3(transitive)

• - Removednode-opcua-service-secure-channel@0.2.3(transitive)

• - Removednode-opcua-service-translate-browse-path@0.2.3(transitive)

• - Removednode-opcua-status-code@0.2.3(transitive)

• - Removednode-opcua-utils@0.2.3(transitive)

• - Removednode-opcua-variant@0.2.3(transitive)

• Updatednode-opcua-assert@^0.3.0

• Updatednode-opcua-basic-types@^0.3.0

• Updatednode-opcua-data-model@^0.3.0

• Updatednode-opcua-debug@^0.3.0

• Updatednode-opcua-factory@^0.3.0

• Updatednode-opcua-nodeid@^0.3.0

• Updatednode-opcua-numeric-range@^0.3.0

• Updatednode-opcua-service-translate-browse-path@^0.3.0

• Updatednode-opcua-status-code@^0.3.0

• Updatednode-opcua-variant@^0.3.0