node-opcua-service-filter 2.180.0 → 2.181.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/check_event_clause.js +2 -2
- package/dist/check_event_clause.js.map +1 -1
- package/dist/check_where_clause.d.ts +1 -1
- package/dist/check_where_clause.js +4 -4
- package/dist/check_where_clause.js.map +1 -1
- package/dist/extract_event_field.d.ts +1 -1
- package/dist/extract_event_field.js +2 -2
- package/dist/extract_event_field.js.map +1 -1
- package/dist/imports.d.ts +2 -1
- package/dist/imports.js +2 -2
- package/dist/imports.js.map +1 -1
- package/dist/index.d.ts +10 -10
- package/dist/index.js +10 -10
- package/dist/index.js.map +1 -1
- package/dist/make_content_filter.d.ts +1 -1
- package/dist/make_content_filter.js +24 -24
- package/dist/make_content_filter.js.map +1 -1
- package/dist/on_address_space/extract_event_fields.js +4 -4
- package/dist/on_address_space/extract_event_fields.js.map +1 -1
- package/dist/on_address_space/filter_context_on_address_space.d.ts +1 -1
- package/dist/on_address_space/index.d.ts +2 -2
- package/dist/on_address_space/index.js +2 -2
- package/dist/on_address_space/index.js.map +1 -1
- package/dist/resolve_operand.d.ts +1 -1
- package/dist/tools_event_filter.d.ts +4 -4
- package/dist/tools_event_filter.js +8 -6
- package/dist/tools_event_filter.js.map +1 -1
- package/package.json +16 -16
- package/source/check_event_clause.ts +2 -2
- package/source/check_where_clause.ts +2 -2
- package/source/extract_event_field.ts +2 -2
- package/source/imports.ts +13 -10
- package/source/index.ts +10 -10
- package/source/make_content_filter.ts +1 -1
- package/source/on_address_space/extract_event_fields.ts +2 -2
- package/source/on_address_space/filter_context_on_address_space.ts +1 -1
- package/source/on_address_space/index.ts +2 -2
- package/source/resolve_operand.ts +1 -1
- package/source/tools_event_filter.ts +13 -4
|
@@ -9,8 +9,8 @@ const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
|
9
9
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
10
10
|
const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
|
|
11
11
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
12
|
-
const debugLog = (0, node_opcua_debug_1.make_debugLog)(
|
|
13
|
-
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(
|
|
12
|
+
const debugLog = (0, node_opcua_debug_1.make_debugLog)("check_event_clause");
|
|
13
|
+
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("check_event_clause");
|
|
14
14
|
/**
|
|
15
15
|
|
|
16
16
|
* @param parentNode
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check_event_clause.js","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAkBH,8CAyBC;AAQD,gDAEC;AAlDD,iEAAkD;AAClD,uDAAiE;AACjE,uGAAgG;AAChG,mEAAsE;AAGtE,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,
|
|
1
|
+
{"version":3,"file":"check_event_clause.js","sourceRoot":"","sources":["../source/check_event_clause.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAkBH,8CAyBC;AAQD,gDAEC;AAlDD,iEAAkD;AAClD,uDAAiE;AACjE,uGAAgG;AAChG,mEAAsE;AAGtE,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,oBAAoB,CAAC,CAAC;AACrD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,oBAAoB,CAAC,CAAC;AAErD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,UAAoB,EAAE,YAAoC;IACxF,EAAE;IACF,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAE7C,iBAAiB;IACjB,IAAI,YAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1C,OAAO,oCAAW,CAAC,IAAI,CAAC;IAC5B,CAAC;IACD,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAEhF,2DAA2D;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,oCAAW,CAAC,gBAAgB,CAAC;IACxC,CAAC;IACD,yDAAyD;IACzD,IAAI,aAAa,CAAC,SAAS,KAAK,iCAAS,CAAC,UAAU,EAAE,CAAC;QACnD,iBAAiB;QACjB,OAAO,IAAI,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,OAAO,oCAAW,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,yEAAyE;IACzE,MAAM,UAAU,GAAG,IAAA,+EAAoC,EAAC,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAChG,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7D,OAAO,gBAAgB,CAAC,UAAU,CAAC;AACvC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,aAA2B,EAAE,aAAuC;IACnG,OAAO,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type StatusCode } from "node-opcua-status-code";
|
|
2
2
|
import { type ContentFilter } from "node-opcua-types";
|
|
3
|
-
import type { FilterContext } from "./filter_context";
|
|
3
|
+
import type { FilterContext } from "./filter_context.js";
|
|
4
4
|
/**
|
|
5
5
|
* Validate the structure of a ContentFilter, returning a precise StatusCode (Good when valid).
|
|
6
6
|
*
|
|
@@ -8,7 +8,7 @@ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
|
8
8
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
9
9
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
10
10
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
11
|
-
const
|
|
11
|
+
const resolve_operand_js_1 = require("./resolve_operand.js");
|
|
12
12
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)("Filter");
|
|
13
13
|
function _coerceToBoolean(value) {
|
|
14
14
|
if (value instanceof node_opcua_variant_1.Variant) {
|
|
@@ -59,10 +59,10 @@ function _coerceToEqualable(value) {
|
|
|
59
59
|
// call-site contract explicit instead of silently typing the whole function `any`.
|
|
60
60
|
function evaluateOperand(filterContext, filter, operand, coerce) {
|
|
61
61
|
if (operand instanceof node_opcua_types_1.AttributeOperand) {
|
|
62
|
-
return coerce((0,
|
|
62
|
+
return coerce((0, resolve_operand_js_1.resolveOperand)(filterContext, operand));
|
|
63
63
|
}
|
|
64
64
|
else if (operand instanceof node_opcua_types_1.SimpleAttributeOperand) {
|
|
65
|
-
return coerce((0,
|
|
65
|
+
return coerce((0, resolve_operand_js_1.resolveOperand)(filterContext, operand));
|
|
66
66
|
}
|
|
67
67
|
else if (operand instanceof node_opcua_types_1.LiteralOperand) {
|
|
68
68
|
return coerce(operand.value);
|
|
@@ -235,7 +235,7 @@ function checkInList(context, filterOperands) {
|
|
|
235
235
|
warningLog(`FilterOperator.InList operand0 is not a SimpleAttributeOperand ${operand0.constructor.name}`);
|
|
236
236
|
return false;
|
|
237
237
|
}
|
|
238
|
-
const value = (0,
|
|
238
|
+
const value = (0, resolve_operand_js_1.resolveOperand)(context, operand0);
|
|
239
239
|
// c8 ignore next
|
|
240
240
|
if (value.dataType !== node_opcua_variant_1.DataType.NodeId) {
|
|
241
241
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check_where_clause.js","sourceRoot":"","sources":["../source/check_where_clause.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"check_where_clause.js","sourceRoot":"","sources":["../source/check_where_clause.ts"],"names":[],"mappings":";;AAmYA,sDA4EC;AAED,kCAKC;AAtdD,iEAAkD;AAClD,uDAAmD;AAEnD,yDAA4D;AAC5D,mEAAsE;AACtE,uDAS0B;AAC1B,2DAAuD;AAGvD,6DAAsD;AAEtD,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,QAAQ,CAAC,CAAC;AAE7C,SAAS,gBAAgB,CAAC,KAAuC;IAC7D,IAAI,KAAK,YAAY,4BAAO,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,CAAC;AACnB,CAAC;AACD,SAAS,oBAAoB,CAAC,KAAc;IACxC,IAAI,KAAK,YAAY,4BAAO,EAAE,CAAC;QAC3B,QAAQ,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrB,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,KAAK,CAAC,KAAK,CAAC;YACvB,KAAK,6BAAQ,CAAC,IAAI,CAAC;YACnB,KAAK,6BAAQ,CAAC,KAAK,CAAC;YACpB,KAAK,6BAAQ,CAAC,KAAK,CAAC;YACpB,KAAK,6BAAQ,CAAC,KAAK,CAAC;YACpB,KAAK,6BAAQ,CAAC,MAAM,CAAC;YACrB,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,KAAK,CAAC,KAAK,CAAC;YACvB,KAAK,6BAAQ,CAAC,MAAM;gBAChB,OAAO,KAAK,CAAC,KAAK,CAAC;YACvB,KAAK,6BAAQ,CAAC,QAAQ;gBAClB,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACjC,KAAK,6BAAQ,CAAC,IAAI;gBACd,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACrC,KAAK,6BAAQ,CAAC,UAAU;gBACpB,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACvC,KAAK,6BAAQ,CAAC,UAAU;gBACpB,OAAO,KAAK,CAAC,KAAK,CAAC;YACvB,KAAK,6BAAQ,CAAC,aAAa;gBACvB,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;YAC5B,KAAK,6BAAQ,CAAC,aAAa;gBACvB,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,0BAA0B;YACvD;gBACI,OAAO,EAAE,CAAC;QAClB,CAAC;IACL,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACtC,OAAO,KAAK,CAAC;AACjB,CAAC;AACD,kFAAkF;AAClF,0FAA0F;AAC1F,4FAA4F;AAC5F,sFAAsF;AACtF,4FAA4F;AAC5F,mFAAmF;AACnF,SAAS,eAAe,CACpB,aAA4B,EAC5B,MAAqB,EACrB,OAAsB,EACtB,MAAyB;IAEzB,IAAI,OAAO,YAAY,mCAAgB,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,IAAA,mCAAc,EAAC,aAAa,EAAE,OAAO,CAAQ,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,OAAO,YAAY,yCAAsB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC,IAAA,mCAAc,EAAC,aAAa,EAAE,OAAO,CAAQ,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,OAAO,YAAY,iCAAc,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC,OAAO,CAAC,KAAY,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,OAAO,YAAY,iCAAc,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,OAAO,MAAM,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAQ,CAAC,CAAC;IAC3E,CAAC;IACD,kBAAkB;IAClB,OAAO,MAAM,CAAC,IAAW,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,aAA4B,EAAE,MAA8B;IAC7E,iBAAiB;IACjB,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,YAAY,iCAAc,CAAC,EAAE,CAAC;QACjD,UAAU,CAAC,6EAA6E,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC9G,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,iBAAiB;IACjB,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,KAAK,6BAAQ,CAAC,MAAM,EAAE,CAAC;QAC5C,UAAU,CAAC,gDAAgD,6BAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC9F,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,UAAU,GAAW,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;IAC9C,iBAAiB;IACjB,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,KAAK,CAAC,CAAC,yDAAyD;IAC3E,CAAC;IACD,MAAM,mBAAmB,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAEnE,iBAAiB;IACjB,IACI,mBAAmB,KAAK,iCAAS,CAAC,UAAU;QAC5C,mBAAmB,KAAK,iCAAS,CAAC,YAAY;QAC9C,mBAAmB,KAAK,iCAAS,CAAC,QAAQ;QAC1C,mBAAmB,KAAK,iCAAS,CAAC,aAAa,EACjD,CAAC;QACC,UAAU,CAAC,kCAAkC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,oBAAoB,GAAG,aAAa,CAAC,WAAW,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC9E,IAAI,eAAe,KAAK,iCAAS,CAAC,MAAM,IAAI,eAAe,KAAK,iCAAS,CAAC,QAAQ,EAAE,CAAC;QACjF,MAAM,cAAc,GAAG,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAClF,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,oBAAoB,GAAG,cAAc,CAAC;IAC1C,CAAC;IACD,OAAO,aAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,QAAQ,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACpG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,OAAO,CAAC,QAAQ,CAAC;AACrB,CAAC;AAED,SAAS,OAAO,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACnG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAChC,CAAC;AACD;;;;;;;;GAQG;AACH,SAAS,QAAQ,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACpG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAChC,CAAC;AACD,SAAS,aAAa,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACzG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,OAAO,QAAQ,GAAG,QAAQ,CAAC;AAC/B,CAAC;AAED,SAAS,oBAAoB,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IAChH,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IAC5G,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,OAAO,QAAQ,GAAG,QAAQ,CAAC;AAC/B,CAAC;AAED,SAAS,uBAAuB,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACnH,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,OAAO,QAAQ,IAAI,QAAQ,CAAC;AAChC,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,CAAU,EAAW,EAAE;IACvD,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjB,KAAK,6BAAQ,CAAC,IAAI;YACd,OAAO,CAAC,CAAC,QAAQ,KAAK,6BAAQ,CAAC,IAAI,CAAC;QACxC,KAAK,6BAAQ,CAAC,OAAO;YACjB,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;QAC/B,KAAK,6BAAQ,CAAC,IAAI,CAAC;QACnB,KAAK,6BAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,6BAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,6BAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,6BAAQ,CAAC,MAAM,CAAC;QACrB,KAAK,6BAAQ,CAAC,MAAM;YAChB,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;QAC/B,KAAK,6BAAQ,CAAC,MAAM;YAChB,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;QAC/B,KAAK,6BAAQ,CAAC,MAAM;YAChB,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;QAC/B,KAAK,6BAAQ,CAAC,MAAM;YAChB,OAAO,IAAA,8BAAU,EAAC,CAAC,CAAC,KAAe,EAAE,CAAC,CAAC,KAAe,CAAC,CAAC;QAC5D,KAAK,6BAAQ,CAAC,QAAQ;YAClB,OAAQ,CAAC,CAAC,KAAc,EAAE,OAAO,EAAE,KAAM,CAAC,CAAC,KAAc,CAAC,OAAO,EAAE,CAAC;QACxE,KAAK,6BAAQ,CAAC,IAAI;YACd,OAAO,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;QACtE,KAAK,6BAAQ,CAAC,UAAU;YACpB,IAAI,CAAC,CAAC,QAAQ,KAAK,6BAAQ,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/D,KAAK,6BAAQ,CAAC,UAAU;YACpB,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;QAC/B,KAAK,6BAAQ,CAAC,aAAa;YACvB,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;QAC3C,KAAK,6BAAQ,CAAC,aAAa;YACvB,OAAO,CAAC,CAAC,KAAK,EAAE,cAAc,KAAK,CAAC,CAAC,KAAK,EAAE,cAAc,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;QAClG,KAAK,6BAAQ,CAAC,eAAe;YACzB,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC5E,OAAO,KAAK,CAAC;QACjB;YACI,OAAO,KAAK,CAAC,CAAC,qBAAqB;IAC3C,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,WAAW,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACvG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACjG,OAAO,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AACD;;;;;;;;;;;GAWG;AACH,SAAS,YAAY,CAAC,aAA4B,EAAE,MAAqB,EAAE,gBAAiC;IACxG,MAAM,QAAQ,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACrG,MAAM,WAAW,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtG,OAAO,QAAQ,IAAI,UAAU,IAAI,QAAQ,IAAI,WAAW,CAAC;AAC7D,CAAC;AAED;;;;;;IAMI;AACJ,SAAS,WAAW,CAAC,OAAsB,EAAE,cAA+B;IACxE,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IAEnC,iBAAiB;IACjB,IAAI,CAAC,CAAC,QAAQ,YAAY,yCAAsB,CAAC,EAAE,CAAC;QAChD,mBAAmB;QACnB,UAAU,CAAC,kEAAkE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1G,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,KAAK,GAAG,IAAA,mCAAc,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEhD,iBAAiB;IACjB,IAAI,KAAK,CAAC,QAAQ,KAAK,6BAAQ,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAkB,KAAK,CAAC,KAAe,CAAC;IAEpD,iBAAiB;IACjB,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAS,GAAG,CAAC,OAAe,EAAE,QAAwB;QAClD,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,KAAK,6BAAQ,CAAC,MAAM,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC;QAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,SAAS,KAAK,iCAAS,CAAC,WAAW,EAAE,CAAC;YACtC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAA,8BAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,aAAa,YAAY,iCAAc,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;YACxE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CAAC,aAA4B,EAAE,MAAqB,EAAE,KAAa;IAC1F,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEvC,iBAAiB;IACjB,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,cAAc,GAAI,OAAO,CAAC,cAAyC,IAAI,EAAE,CAAC;IAEhF,QAAQ,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7B,KAAK,iCAAc,CAAC,MAAM;YACtB,OAAO,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC9D,KAAK,iCAAc,CAAC,QAAQ;YACxB,OAAO,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAChE,KAAK,iCAAc,CAAC,eAAe;YAC/B,OAAO,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACvE,KAAK,iCAAc,CAAC,WAAW;YAC3B,OAAO,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACnE,KAAK,iCAAc,CAAC,kBAAkB;YAClC,OAAO,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC1E,KAAK,iCAAc,CAAC,OAAO;YACvB,OAAO,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAE/D,KAAK,iCAAc,CAAC,GAAG;YACnB,OAAO,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC3D,KAAK,iCAAc,CAAC,EAAE;YAClB,OAAO,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC1D,KAAK,iCAAc,CAAC,GAAG;YACnB,OAAO,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3D,KAAK,iCAAc,CAAC,MAAM;YACtB,OAAO,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QAC3E,KAAK,iCAAc,CAAC,MAAM;YACtB,OAAO,WAAW,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QACtD;YACI,+DAA+D;YAC/D,2FAA2F;YAC3F,yDAAyD;YACzD,UAAU,CAAC,yBAAyB,iCAAc,CAAC,OAAO,CAAC,cAAc,CAAC,uCAAuC,CAAC,CAAC;YACnH,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC;AAED,gGAAgG;AAChG,kGAAkG;AAClG,yCAAyC;AACzC,MAAM,sBAAsB,GAAyD;IACjF,CAAC,iCAAc,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC3C,CAAC,iCAAc,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC3C,CAAC,iCAAc,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAChD,CAAC,iCAAc,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC7C,CAAC,iCAAc,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACvD,CAAC,iCAAc,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACpD,CAAC,iCAAc,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACzC,CAAC,iCAAc,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACxC,CAAC,iCAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC5C,CAAC,iCAAc,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,iBAAiB,EAAE;IAClE,CAAC,iCAAc,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACxC,CAAC,iCAAc,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACvC,CAAC,iCAAc,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACzC,CAAC,iCAAc,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC/C,CAAC,iCAAc,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC9C,CAAC,iCAAc,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC3C,CAAC,iCAAc,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC3C,CAAC,iCAAc,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;CACjD,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,qBAAqB,CAAC,MAAqB;IACvD,MAAM,QAAQ,GAAI,MAAM,CAAC,QAA0C,IAAI,EAAE,CAAC;IAC1E,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACV,OAAO,oCAAW,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,4FAA4F;IAC5F,0FAA0F;IAC1F,MAAM,OAAO,GAAG,CAAC,YAAoB,EAA6C,EAAE;QAChF,MAAM,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QACvC,sGAAsG;QACtG,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,oCAAW,CAAC,IAAI,EAAE,CAAC;QACrD,CAAC;QACD,MAAM,QAAQ,GAAI,OAAO,CAAC,cAAyC,IAAI,EAAE,CAAC;QAC1E,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjF,UAAU,CACN,yBAAyB,iCAAc,CAAC,OAAO,CAAC,cAAc,CAAC,gBAAgB,YAAY,GAAG;gBAC1F,OAAO,QAAQ,CAAC,MAAM,yBAAyB,QAAQ,CAAC,GAAG,GACvD,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,GAAG,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAC5G,EAAE,CACT,CAAC;YACF,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,oCAAW,CAAC,6BAA6B,EAAE,CAAC;QAC9E,CAAC;QACD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,OAAO,YAAY,iCAAc,EAAE,CAAC;gBACpC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC5B,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;oBAC1B,UAAU,CACN,2CAA2C,YAAY,sCAAsC,KAAK,GAAG;wBACjG,sBAAsB,CAAC,GAAG,CACjC,CAAC;oBACF,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,oCAAW,CAAC,uBAAuB,EAAE,CAAC;gBACxE,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;QACL,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,oCAAW,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC,CAAC;IAEF,iEAAiE;IACjE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,KAAK,GAA4D,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpH,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtC,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,KAAK,CAAC,GAAG,EAAE,CAAC;YACZ,SAAS;QACb,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,+DAA+D;YAC/D,UAAU,CAAC,4EAA4E,IAAI,EAAE,CAAC,CAAC;YAC/F,OAAO,oCAAW,CAAC,uBAAuB,CAAC;QAC/C,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,OAAO,CAAC,CAAC,MAAM,CAAC;YACpB,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IACD,OAAO,oCAAW,CAAC,IAAI,CAAC;AAC5B,CAAC;AAED,SAAgB,WAAW,CAAC,aAA4B,EAAE,aAA4B;IAClF,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,oCAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,kBAAkB,CAAC,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SimpleAttributeOperand } from "node-opcua-types";
|
|
2
2
|
import { Variant } from "node-opcua-variant";
|
|
3
|
-
import type { FilterContext } from "./filter_context";
|
|
3
|
+
import type { FilterContext } from "./filter_context.js";
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
* extract a eventField from a event node, matching the given selectClause
|
|
@@ -8,7 +8,7 @@ const node_opcua_debug_1 = require("node-opcua-debug");
|
|
|
8
8
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
9
9
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
10
10
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
11
|
-
const
|
|
11
|
+
const resolve_operand_js_1 = require("./resolve_operand.js");
|
|
12
12
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)("FILTER");
|
|
13
13
|
const conditionTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("ConditionType");
|
|
14
14
|
/**
|
|
@@ -42,7 +42,7 @@ function extractEventField(context, operand) {
|
|
|
42
42
|
// Yeh : our EventType is a Condition Type !
|
|
43
43
|
return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.NodeId, value: context.eventSource });
|
|
44
44
|
}
|
|
45
|
-
return (0,
|
|
45
|
+
return (0, resolve_operand_js_1.resolveOperand)(context, operand);
|
|
46
46
|
}
|
|
47
47
|
function extractEventFieldsBase(context, selectClauses) {
|
|
48
48
|
(0, node_opcua_assert_1.assert)(Array.isArray(selectClauses));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract_event_field.js","sourceRoot":"","sources":["../source/extract_event_field.ts"],"names":[],"mappings":";;AAgBA,8CAgCC;AAED,wDAIC;AAtDD,yDAA2C;AAC3C,iEAAqD;AACrD,uDAAmD;AACnD,yDAA8D;AAC9D,uDAA0D;AAC1D,2DAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"extract_event_field.js","sourceRoot":"","sources":["../source/extract_event_field.ts"],"names":[],"mappings":";;AAgBA,8CAgCC;AAED,wDAIC;AAtDD,yDAA2C;AAC3C,iEAAqD;AACrD,uDAAmD;AACnD,yDAA8D;AAC9D,uDAA0D;AAC1D,2DAAuD;AAEvD,6DAAsD;AAEtD,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,QAAQ,CAAC,CAAC;AAC7C,MAAM,mBAAmB,GAAG,IAAA,iCAAa,EAAC,eAAe,CAAC,CAAC;AAE3D;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAsB,EAAE,OAA+B;IACrF,IAAA,0BAAM,EAAC,OAAO,YAAY,yCAAsB,CAAC,CAAC;IAElD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAE9C,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,WAAW,KAAK,oCAAY,CAAC,MAAM,EAAE,CAAC;QACjF,iCAAiC;QACjC,iCAAiC;QACjC,IAAI,CAAC,IAAA,8BAAU,EAAC,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EAAE,CAAC;YAC7D,sBAAsB;YACtB,gGAAgG;YAChG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EAAE,CAAC;gBACtE,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACrD,UAAU,CAAC,kEAAkE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACpH,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/B,OAAO,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAClF,CAAC;QACL,CAAC;QAED,MAAM,yBAAyB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7B,mCAAmC;YACnC,OAAO,IAAI,4BAAO,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,yBAAyB,EAAE,mBAAmB,CAAC,EAAE,CAAC;YACvE,OAAO,IAAI,4BAAO,EAAE,CAAC;QACzB,CAAC;QACD,4CAA4C;QAC5C,OAAO,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,IAAA,mCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAAsB,EAAE,aAAuC;IAClG,IAAA,0BAAM,EAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IACrC,IAAA,0BAAM,EAAC,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,YAAY,yCAAsB,CAAC,CAAC;IACzF,OAAO,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
package/dist/imports.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-service-filter
|
|
3
3
|
*/
|
|
4
|
-
export {
|
|
4
|
+
export type { AttributeOperandOptions, ContentFilterElementOptions, ContentFilterOptions, ElementOperandOptions, EventFilterOptions, FilterOperandOptions, LiteralOperandOptions, MonitoringFilterOptions, SimpleAttributeOperandOptions } from "node-opcua-types";
|
|
5
|
+
export { AttributeOperand, ContentFilter, ContentFilterElement, DataChangeFilter, ElementOperand, EventFilter, FilterOperand, FilterOperator, LiteralOperand, MonitoringFilter, SimpleAttributeOperand } from "node-opcua-types";
|
package/dist/imports.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SimpleAttributeOperand = exports.MonitoringFilter = exports.LiteralOperand = exports.FilterOperator = exports.FilterOperand = exports.EventFilter = exports.ElementOperand = exports.DataChangeFilter = exports.ContentFilterElement = exports.ContentFilter = exports.AttributeOperand = void 0;
|
|
4
2
|
/**
|
|
5
3
|
* @module node-opcua-service-filter
|
|
6
4
|
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SimpleAttributeOperand = exports.MonitoringFilter = exports.LiteralOperand = exports.FilterOperator = exports.FilterOperand = exports.EventFilter = exports.ElementOperand = exports.DataChangeFilter = exports.ContentFilterElement = exports.ContentFilter = exports.AttributeOperand = void 0;
|
|
7
7
|
var node_opcua_types_1 = require("node-opcua-types");
|
|
8
8
|
Object.defineProperty(exports, "AttributeOperand", { enumerable: true, get: function () { return node_opcua_types_1.AttributeOperand; } });
|
|
9
9
|
Object.defineProperty(exports, "ContentFilter", { enumerable: true, get: function () { return node_opcua_types_1.ContentFilter; } });
|
package/dist/imports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../source/imports.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../source/imports.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAaH,qDAY0B;AAXtB,oHAAA,gBAAgB,OAAA;AAChB,iHAAA,aAAa,OAAA;AACb,wHAAA,oBAAoB,OAAA;AACpB,oHAAA,gBAAgB,OAAA;AAChB,kHAAA,cAAc,OAAA;AACd,+GAAA,WAAW,OAAA;AACX,iHAAA,aAAa,OAAA;AACb,kHAAA,cAAc,OAAA;AACd,kHAAA,cAAc,OAAA;AACd,oHAAA,gBAAgB,OAAA;AAChB,0HAAA,sBAAsB,OAAA"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-service-filter
|
|
3
3
|
*/
|
|
4
|
-
export * from "./check_event_clause";
|
|
5
|
-
export * from "./check_where_clause";
|
|
6
|
-
export * from "./extract_event_field";
|
|
7
|
-
export * from "./filter_context";
|
|
8
|
-
export * from "./imports";
|
|
9
|
-
export * from "./make_content_filter";
|
|
10
|
-
export * from "./on_address_space/extract_event_fields";
|
|
11
|
-
export * from "./on_address_space/filter_context_on_address_space";
|
|
12
|
-
export * from "./resolve_operand";
|
|
13
|
-
export * from "./tools_event_filter";
|
|
4
|
+
export * from "./check_event_clause.js";
|
|
5
|
+
export * from "./check_where_clause.js";
|
|
6
|
+
export * from "./extract_event_field.js";
|
|
7
|
+
export * from "./filter_context.js";
|
|
8
|
+
export * from "./imports.js";
|
|
9
|
+
export * from "./make_content_filter.js";
|
|
10
|
+
export * from "./on_address_space/extract_event_fields.js";
|
|
11
|
+
export * from "./on_address_space/filter_context_on_address_space.js";
|
|
12
|
+
export * from "./resolve_operand.js";
|
|
13
|
+
export * from "./tools_event_filter.js";
|
package/dist/index.js
CHANGED
|
@@ -17,16 +17,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
/**
|
|
18
18
|
* @module node-opcua-service-filter
|
|
19
19
|
*/
|
|
20
|
-
__exportStar(require("./check_event_clause"), exports);
|
|
21
|
-
__exportStar(require("./check_where_clause"), exports);
|
|
22
|
-
__exportStar(require("./extract_event_field"), exports);
|
|
23
|
-
__exportStar(require("./filter_context"), exports);
|
|
24
|
-
__exportStar(require("./imports"), exports);
|
|
25
|
-
__exportStar(require("./make_content_filter"), exports);
|
|
26
|
-
__exportStar(require("./on_address_space/extract_event_fields"), exports);
|
|
27
|
-
__exportStar(require("./on_address_space/filter_context_on_address_space"), exports);
|
|
28
|
-
__exportStar(require("./resolve_operand"), exports);
|
|
29
|
-
__exportStar(require("./tools_event_filter"), exports);
|
|
20
|
+
__exportStar(require("./check_event_clause.js"), exports);
|
|
21
|
+
__exportStar(require("./check_where_clause.js"), exports);
|
|
22
|
+
__exportStar(require("./extract_event_field.js"), exports);
|
|
23
|
+
__exportStar(require("./filter_context.js"), exports);
|
|
24
|
+
__exportStar(require("./imports.js"), exports);
|
|
25
|
+
__exportStar(require("./make_content_filter.js"), exports);
|
|
26
|
+
__exportStar(require("./on_address_space/extract_event_fields.js"), exports);
|
|
27
|
+
__exportStar(require("./on_address_space/filter_context_on_address_space.js"), exports);
|
|
28
|
+
__exportStar(require("./resolve_operand.js"), exports);
|
|
29
|
+
__exportStar(require("./tools_event_filter.js"), exports);
|
|
30
30
|
// The SimpleAttributeOperand is a simplified form of the AttributeOperand and all of the rules that
|
|
31
31
|
// apply to the AttributeOperand also apply to the SimpleAttributeOperand. The examples provided in
|
|
32
32
|
// B.1 only use AttributeOperand, however, the AttributeOperand can be replaced by a
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,0DAAwC;AACxC,0DAAwC;AACxC,2DAAyC;AACzC,sDAAoC;AACpC,+CAA6B;AAC7B,2DAAyC;AACzC,6EAA2D;AAC3D,wFAAsE;AACtE,uDAAqC;AACrC,0DAAwC;AAExC,oGAAoG;AACpG,mGAAmG;AACnG,oFAAoF;AACpF,yFAAyF;AACzF,mGAAmG;AAEnG,mBAAmB;AACnB,iFAAiF;AACjF,uBAAuB;AACvB,mGAAmG;AAEnG,aAAa;AACb,6BAA6B;AAC7B,kFAAkF;AAClF,uEAAuE;AACvE,gFAAgF;AAChF,kEAAkE;AAClE,2EAA2E;AAC3E,YAAY;AACZ,wEAAwE;AACxE,mEAAmE;AAEnE,yDAAyD;AACzD,8EAA8E;AAC9E,4EAA4E;AAC5E,iBAAiB;AACjB,iDAAiD;AAEjD,qFAAqF;AACrF,8EAA8E;AAC9E,qFAAqF;AACrF,4BAA4B;AAC5B,0CAA0C;AAC1C,uEAAuE;AACvE,4CAA4C;AAC5C,kDAAkD"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { DataType } from "node-opcua-basic-types";
|
|
5
5
|
import { type AttributeIds } from "node-opcua-data-model";
|
|
6
6
|
import { type NodeIdLike } from "node-opcua-nodeid";
|
|
7
|
-
import { type AttributeOperand, ContentFilter, ContentFilterElement, type ContentFilterElementOptions, LiteralOperand, SimpleAttributeOperand } from "./imports";
|
|
7
|
+
import { type AttributeOperand, ContentFilter, ContentFilterElement, type ContentFilterElementOptions, LiteralOperand, SimpleAttributeOperand } from "./imports.js";
|
|
8
8
|
export declare function ofType(nodeId: NodeIdLike): ContentFilterElement;
|
|
9
9
|
export declare function l(dataType: DataType, value: unknown): LiteralOperand;
|
|
10
10
|
export declare function n(n: NodeIdLike): LiteralOperand;
|
|
@@ -20,12 +20,12 @@ const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
|
20
20
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
21
21
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
22
22
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
23
|
-
const
|
|
23
|
+
const imports_js_1 = require("./imports.js");
|
|
24
24
|
function ofType(nodeId) {
|
|
25
|
-
const element = new
|
|
26
|
-
filterOperator:
|
|
25
|
+
const element = new imports_js_1.ContentFilterElement({
|
|
26
|
+
filterOperator: imports_js_1.FilterOperator.OfType,
|
|
27
27
|
filterOperands: [
|
|
28
|
-
new
|
|
28
|
+
new imports_js_1.LiteralOperand({
|
|
29
29
|
value: {
|
|
30
30
|
dataType: node_opcua_basic_types_1.DataType.NodeId,
|
|
31
31
|
value: (0, node_opcua_nodeid_1.resolveNodeId)(nodeId)
|
|
@@ -40,57 +40,57 @@ function l(dataType, value) {
|
|
|
40
40
|
case node_opcua_basic_types_1.DataType.NodeId:
|
|
41
41
|
value = (0, node_opcua_nodeid_1.resolveNodeId)(value);
|
|
42
42
|
}
|
|
43
|
-
return new
|
|
43
|
+
return new imports_js_1.LiteralOperand({ value: new node_opcua_variant_1.Variant({ dataType, value }) });
|
|
44
44
|
}
|
|
45
45
|
function n(n) {
|
|
46
46
|
return l(node_opcua_basic_types_1.DataType.NodeId, n);
|
|
47
47
|
}
|
|
48
48
|
function s(attributeId, path) {
|
|
49
|
-
return new
|
|
49
|
+
return new imports_js_1.SimpleAttributeOperand({
|
|
50
50
|
attributeId: attributeId,
|
|
51
51
|
browsePath: path.split(".").map(node_opcua_data_model_1.coerceQualifiedName)
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
function or(a, b) {
|
|
55
|
-
return new
|
|
55
|
+
return new imports_js_1.ContentFilterElement({
|
|
56
56
|
filterOperands: [a, b],
|
|
57
|
-
filterOperator:
|
|
57
|
+
filterOperator: imports_js_1.FilterOperator.Or
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
function and(a, b) {
|
|
61
|
-
return new
|
|
61
|
+
return new imports_js_1.ContentFilterElement({
|
|
62
62
|
filterOperands: [a, b],
|
|
63
|
-
filterOperator:
|
|
63
|
+
filterOperator: imports_js_1.FilterOperator.And
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
function lessThan(a, b) {
|
|
67
|
-
return new
|
|
67
|
+
return new imports_js_1.ContentFilterElement({
|
|
68
68
|
filterOperands: [a, b],
|
|
69
|
-
filterOperator:
|
|
69
|
+
filterOperator: imports_js_1.FilterOperator.LessThan
|
|
70
70
|
});
|
|
71
71
|
}
|
|
72
72
|
function LessThanOrEqual(a, b) {
|
|
73
|
-
return new
|
|
73
|
+
return new imports_js_1.ContentFilterElement({
|
|
74
74
|
filterOperands: [a, b],
|
|
75
|
-
filterOperator:
|
|
75
|
+
filterOperator: imports_js_1.FilterOperator.LessThanOrEqual
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
function greaterThanOrEqual(a, b) {
|
|
79
|
-
return new
|
|
79
|
+
return new imports_js_1.ContentFilterElement({
|
|
80
80
|
filterOperands: [a, b],
|
|
81
|
-
filterOperator:
|
|
81
|
+
filterOperator: imports_js_1.FilterOperator.GreaterThanOrEqual
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
function greaterThan(a, b) {
|
|
85
|
-
return new
|
|
85
|
+
return new imports_js_1.ContentFilterElement({
|
|
86
86
|
filterOperands: [a, b],
|
|
87
|
-
filterOperator:
|
|
87
|
+
filterOperator: imports_js_1.FilterOperator.GreaterThan
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
function inList(a, l) {
|
|
91
|
-
return new
|
|
91
|
+
return new imports_js_1.ContentFilterElement({
|
|
92
92
|
filterOperands: [a, ...l],
|
|
93
|
-
filterOperator:
|
|
93
|
+
filterOperator: imports_js_1.FilterOperator.InList
|
|
94
94
|
});
|
|
95
95
|
}
|
|
96
96
|
function makeContentFilterElements(o) {
|
|
@@ -101,9 +101,9 @@ function makeContentFilterElements(o) {
|
|
|
101
101
|
if (element.filterOperands) {
|
|
102
102
|
for (let i = 0; i < element.filterOperands.length; i++) {
|
|
103
103
|
const op = element.filterOperands[i];
|
|
104
|
-
if (op instanceof
|
|
104
|
+
if (op instanceof imports_js_1.ContentFilterElement) {
|
|
105
105
|
const index = pushElement(op);
|
|
106
|
-
element.filterOperands[i] = new
|
|
106
|
+
element.filterOperands[i] = new imports_js_1.ElementOperand({ index });
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
}
|
|
@@ -113,8 +113,8 @@ function makeContentFilterElements(o) {
|
|
|
113
113
|
return elements;
|
|
114
114
|
}
|
|
115
115
|
function makeContentFilter(o) {
|
|
116
|
-
return new
|
|
117
|
-
elements: makeContentFilterElements(o instanceof
|
|
116
|
+
return new imports_js_1.ContentFilter({
|
|
117
|
+
elements: makeContentFilterElements(o instanceof imports_js_1.ContentFilterElement ? o : new imports_js_1.ContentFilterElement(o))
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
120
|
//# sourceMappingURL=make_content_filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make_content_filter.js","sourceRoot":"","sources":["../source/make_content_filter.ts"],"names":[],"mappings":";;AAmBA,wBAaC;AAED,cAOC;AACD,cAEC;AAED,cAKC;AAID,gBAKC;AACD,kBAKC;AACD,4BAKC;AACD,0CAKC;AAED,gDAKC;AAED,kCAKC;AAED,wBAKC;AAED,8DAoBC;AAED,8CAIC;AA/HD;;GAEG;AACH,mEAAkD;AAClD,iEAA+E;AAC/E,yDAAmE;AACnE,2DAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"make_content_filter.js","sourceRoot":"","sources":["../source/make_content_filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractEventFields = extractEventFields;
|
|
4
4
|
//
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const extract_event_field_js_1 = require("../extract_event_field.js");
|
|
6
|
+
const filter_context_on_address_space_js_1 = require("./filter_context_on_address_space.js");
|
|
7
7
|
/**
|
|
8
8
|
|
|
9
9
|
* extract a array of eventFields from a event node, matching the selectClauses
|
|
@@ -11,7 +11,7 @@ const filter_context_on_address_space_1 = require("./filter_context_on_address_s
|
|
|
11
11
|
* @param eventData : a pseudo Node that provides a browse Method and a readValue(nodeId)
|
|
12
12
|
*/
|
|
13
13
|
function extractEventFields(sessionContext, selectClauses, eventData) {
|
|
14
|
-
const context = new
|
|
15
|
-
return (0,
|
|
14
|
+
const context = new filter_context_on_address_space_js_1.FilterContextOnAddressSpace(sessionContext, eventData);
|
|
15
|
+
return (0, extract_event_field_js_1.extractEventFieldsBase)(context, selectClauses);
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=extract_event_fields.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract_event_fields.js","sourceRoot":"","sources":["../../source/on_address_space/extract_event_fields.ts"],"names":[],"mappings":";;AAaA,gDAOC;AAjBD,EAAE;AACF,
|
|
1
|
+
{"version":3,"file":"extract_event_fields.js","sourceRoot":"","sources":["../../source/on_address_space/extract_event_fields.ts"],"names":[],"mappings":";;AAaA,gDAOC;AAjBD,EAAE;AACF,sEAAmE;AACnE,6FAAmF;AAEnF;;;;;GAKG;AACH,SAAgB,kBAAkB,CAC9B,cAA+B,EAC/B,aAAuC,EACvC,SAAqB;IAErB,MAAM,OAAO,GAAG,IAAI,gEAA2B,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAC3E,OAAO,IAAA,+CAAsB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { NodeClass } from "node-opcua-data-model";
|
|
|
3
3
|
import { NodeId, type NodeIdLike } from "node-opcua-nodeid";
|
|
4
4
|
import type { BrowsePath } from "node-opcua-types";
|
|
5
5
|
import { Variant } from "node-opcua-variant";
|
|
6
|
-
import type { FilterContext } from "../filter_context";
|
|
6
|
+
import type { FilterContext } from "../filter_context.js";
|
|
7
7
|
export declare class FilterContextOnAddressSpace implements FilterContext {
|
|
8
8
|
private sessionContext;
|
|
9
9
|
private eventData;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from "./extract_event_fields";
|
|
2
|
-
export * from "./filter_context_on_address_space";
|
|
1
|
+
export * from "./extract_event_fields.js";
|
|
2
|
+
export * from "./filter_context_on_address_space.js";
|
|
@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./extract_event_fields"), exports);
|
|
18
|
-
__exportStar(require("./filter_context_on_address_space"), exports);
|
|
17
|
+
__exportStar(require("./extract_event_fields.js"), exports);
|
|
18
|
+
__exportStar(require("./filter_context_on_address_space.js"), exports);
|
|
19
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/on_address_space/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/on_address_space/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,uEAAqD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { AttributeOperand, SimpleAttributeOperand } from "node-opcua-types";
|
|
2
2
|
import { Variant } from "node-opcua-variant";
|
|
3
|
-
import type { FilterContext } from "./filter_context";
|
|
3
|
+
import type { FilterContext } from "./filter_context.js";
|
|
4
4
|
export declare function resolveOperand(context: FilterContext, operand: SimpleAttributeOperand | AttributeOperand): Variant;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type QualifiedName, type QualifiedNameOptions } from "node-opcua-data-model";
|
|
2
|
-
import { ContentFilterElement, type ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports";
|
|
3
|
-
export declare function constructSimpleBrowsePath(a: string | string[] | (QualifiedNameOptions | string)[]): QualifiedName[];
|
|
4
|
-
export declare function constructSelectClause(arrayOfNames: string | string[] | (QualifiedNameOptions | string)[][]): SimpleAttributeOperand[];
|
|
2
|
+
import { ContentFilterElement, type ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports.js";
|
|
3
|
+
export declare function constructSimpleBrowsePath(a: string | string[] | QualifiedNameOptions | (QualifiedNameOptions | string)[]): QualifiedName[];
|
|
4
|
+
export declare function constructSelectClause(arrayOfNames: string | string[] | QualifiedNameOptions | (QualifiedNameOptions | string)[] | (QualifiedNameOptions | string)[][]): SimpleAttributeOperand[];
|
|
5
5
|
/**
|
|
6
6
|
* helper to construct event filters:
|
|
7
7
|
* construct a simple event filter
|
|
@@ -17,4 +17,4 @@ export declare function constructSelectClause(arrayOfNames: string | string[] |
|
|
|
17
17
|
* constructEventFilter([ ["SourceName",{namespaceIndex:2 , "MyData"} ]]);
|
|
18
18
|
*
|
|
19
19
|
*/
|
|
20
|
-
export declare function constructEventFilter(arrayOfNames: (QualifiedNameOptions | string)[][] | string[] | string, whereClause?: ContentFilterOptions | ContentFilterElement): EventFilter;
|
|
20
|
+
export declare function constructEventFilter(arrayOfNames: (QualifiedNameOptions | string)[][] | (QualifiedNameOptions | string)[] | QualifiedNameOptions | string[] | string, whereClause?: ContentFilterOptions | ContentFilterElement): EventFilter;
|
|
@@ -8,13 +8,15 @@ exports.constructEventFilter = constructEventFilter;
|
|
|
8
8
|
*/
|
|
9
9
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
10
10
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
11
|
-
const
|
|
11
|
+
const imports_js_1 = require("./imports.js");
|
|
12
12
|
function coerceQualifiedName2(a) {
|
|
13
13
|
if (typeof a === "string")
|
|
14
14
|
return (0, node_opcua_data_model_1.coerceQualifiedName)(a);
|
|
15
15
|
a.namespaceIndex = a.namespaceIndex || 0; // need a namespaceIndex
|
|
16
16
|
return (0, node_opcua_data_model_1.coerceQualifiedName)(a);
|
|
17
17
|
}
|
|
18
|
+
// A bare QualifiedNameOptions is accepted, and always was: the last line coerces a
|
|
19
|
+
// single non-array value. Only the signature said otherwise.
|
|
18
20
|
function constructSimpleBrowsePath(a) {
|
|
19
21
|
if (typeof a === "string") {
|
|
20
22
|
return constructSimpleBrowsePath(a.split("."));
|
|
@@ -51,7 +53,7 @@ function constructSelectClause(arrayOfNames) {
|
|
|
51
53
|
// browsePath[] QualifiedName empty
|
|
52
54
|
// attributeId IntegerId Id of the NodeId Attribute
|
|
53
55
|
//
|
|
54
|
-
return new
|
|
56
|
+
return new imports_js_1.SimpleAttributeOperand({
|
|
55
57
|
attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
|
|
56
58
|
browsePath: null,
|
|
57
59
|
indexRange: undefined, // NumericRange
|
|
@@ -59,7 +61,7 @@ function constructSelectClause(arrayOfNames) {
|
|
|
59
61
|
});
|
|
60
62
|
}
|
|
61
63
|
else
|
|
62
|
-
return new
|
|
64
|
+
return new imports_js_1.SimpleAttributeOperand({
|
|
63
65
|
attributeId: node_opcua_data_model_1.AttributeIds.Value,
|
|
64
66
|
browsePath,
|
|
65
67
|
indexRange: undefined, // NumericRange
|
|
@@ -85,10 +87,10 @@ function constructSelectClause(arrayOfNames) {
|
|
|
85
87
|
*/
|
|
86
88
|
function constructEventFilter(arrayOfNames, whereClause) {
|
|
87
89
|
const selectClauses = constructSelectClause(arrayOfNames);
|
|
88
|
-
if (whereClause instanceof
|
|
89
|
-
whereClause = new
|
|
90
|
+
if (whereClause instanceof imports_js_1.ContentFilterElement) {
|
|
91
|
+
whereClause = new imports_js_1.ContentFilter({ elements: [whereClause] });
|
|
90
92
|
}
|
|
91
|
-
const filter = new
|
|
93
|
+
const filter = new imports_js_1.EventFilter({
|
|
92
94
|
selectClauses,
|
|
93
95
|
whereClause
|
|
94
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tools_event_filter.js","sourceRoot":"","sources":["../source/tools_event_filter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-service-filter",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.181.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module service-filter",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -11,23 +11,23 @@
|
|
|
11
11
|
"build": "tsc -b"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"node-opcua-address-space-base": "2.
|
|
14
|
+
"node-opcua-address-space-base": "2.181.0",
|
|
15
15
|
"node-opcua-assert": "2.179.0",
|
|
16
|
-
"node-opcua-basic-types": "2.
|
|
17
|
-
"node-opcua-constants": "2.
|
|
18
|
-
"node-opcua-data-model": "2.
|
|
19
|
-
"node-opcua-data-value": "2.
|
|
20
|
-
"node-opcua-debug": "2.
|
|
21
|
-
"node-opcua-extension-object": "2.
|
|
22
|
-
"node-opcua-nodeid": "2.
|
|
23
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
24
|
-
"node-opcua-status-code": "2.
|
|
25
|
-
"node-opcua-types": "2.
|
|
26
|
-
"node-opcua-variant": "2.
|
|
16
|
+
"node-opcua-basic-types": "2.181.0",
|
|
17
|
+
"node-opcua-constants": "2.181.0",
|
|
18
|
+
"node-opcua-data-model": "2.181.0",
|
|
19
|
+
"node-opcua-data-value": "2.181.0",
|
|
20
|
+
"node-opcua-debug": "2.181.0",
|
|
21
|
+
"node-opcua-extension-object": "2.181.0",
|
|
22
|
+
"node-opcua-nodeid": "2.181.0",
|
|
23
|
+
"node-opcua-service-translate-browse-path": "2.181.0",
|
|
24
|
+
"node-opcua-status-code": "2.181.0",
|
|
25
|
+
"node-opcua-types": "2.181.0",
|
|
26
|
+
"node-opcua-variant": "2.181.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"node-opcua-numeric-range": "2.
|
|
30
|
-
"node-opcua-packet-analyzer": "2.
|
|
29
|
+
"node-opcua-numeric-range": "2.181.0",
|
|
30
|
+
"node-opcua-packet-analyzer": "2.181.0"
|
|
31
31
|
},
|
|
32
32
|
"author": "Etienne Rossignon",
|
|
33
33
|
"license": "MIT",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"internet of things"
|
|
45
45
|
],
|
|
46
46
|
"homepage": "http://node-opcua.github.io/",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "f8f472c59e681b2aa18ae1533c3d1e5f17614c5c",
|
|
48
48
|
"files": [
|
|
49
49
|
"dist",
|
|
50
50
|
"source"
|
|
@@ -9,8 +9,8 @@ import { constructBrowsePathFromQualifiedName } from "node-opcua-service-transla
|
|
|
9
9
|
import { type StatusCode, StatusCodes } from "node-opcua-status-code";
|
|
10
10
|
import type { SimpleAttributeOperand } from "node-opcua-types";
|
|
11
11
|
|
|
12
|
-
const debugLog = make_debugLog(
|
|
13
|
-
const doDebug = checkDebugFlag(
|
|
12
|
+
const debugLog = make_debugLog("check_event_clause");
|
|
13
|
+
const doDebug = checkDebugFlag("check_event_clause");
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
16
|
|
|
@@ -15,8 +15,8 @@ import {
|
|
|
15
15
|
} from "node-opcua-types";
|
|
16
16
|
import { DataType, Variant } from "node-opcua-variant";
|
|
17
17
|
//
|
|
18
|
-
import type { FilterContext } from "./filter_context";
|
|
19
|
-
import { resolveOperand } from "./resolve_operand";
|
|
18
|
+
import type { FilterContext } from "./filter_context.js";
|
|
19
|
+
import { resolveOperand } from "./resolve_operand.js";
|
|
20
20
|
|
|
21
21
|
const warningLog = make_warningLog("Filter");
|
|
22
22
|
|
|
@@ -4,8 +4,8 @@ import { make_warningLog } from "node-opcua-debug";
|
|
|
4
4
|
import { resolveNodeId, sameNodeId } from "node-opcua-nodeid";
|
|
5
5
|
import { SimpleAttributeOperand } from "node-opcua-types";
|
|
6
6
|
import { DataType, Variant } from "node-opcua-variant";
|
|
7
|
-
import type { FilterContext } from "./filter_context";
|
|
8
|
-
import { resolveOperand } from "./resolve_operand";
|
|
7
|
+
import type { FilterContext } from "./filter_context.js";
|
|
8
|
+
import { resolveOperand } from "./resolve_operand.js";
|
|
9
9
|
|
|
10
10
|
const warningLog = make_warningLog("FILTER");
|
|
11
11
|
const conditionTypeNodeId = resolveNodeId("ConditionType");
|
package/source/imports.ts
CHANGED
|
@@ -1,25 +1,28 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-service-filter
|
|
3
3
|
*/
|
|
4
|
+
|
|
5
|
+
export type {
|
|
6
|
+
AttributeOperandOptions,
|
|
7
|
+
ContentFilterElementOptions,
|
|
8
|
+
ContentFilterOptions,
|
|
9
|
+
ElementOperandOptions,
|
|
10
|
+
EventFilterOptions,
|
|
11
|
+
FilterOperandOptions,
|
|
12
|
+
LiteralOperandOptions,
|
|
13
|
+
MonitoringFilterOptions,
|
|
14
|
+
SimpleAttributeOperandOptions
|
|
15
|
+
} from "node-opcua-types";
|
|
4
16
|
export {
|
|
5
17
|
AttributeOperand,
|
|
6
|
-
AttributeOperandOptions,
|
|
7
18
|
ContentFilter,
|
|
8
19
|
ContentFilterElement,
|
|
9
|
-
ContentFilterElementOptions,
|
|
10
|
-
ContentFilterOptions,
|
|
11
20
|
DataChangeFilter,
|
|
12
21
|
ElementOperand,
|
|
13
|
-
ElementOperandOptions,
|
|
14
22
|
EventFilter,
|
|
15
|
-
EventFilterOptions,
|
|
16
23
|
FilterOperand,
|
|
17
|
-
FilterOperandOptions,
|
|
18
24
|
FilterOperator,
|
|
19
25
|
LiteralOperand,
|
|
20
|
-
LiteralOperandOptions,
|
|
21
26
|
MonitoringFilter,
|
|
22
|
-
|
|
23
|
-
SimpleAttributeOperand,
|
|
24
|
-
SimpleAttributeOperandOptions
|
|
27
|
+
SimpleAttributeOperand
|
|
25
28
|
} from "node-opcua-types";
|
package/source/index.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-service-filter
|
|
3
3
|
*/
|
|
4
|
-
export * from "./check_event_clause";
|
|
5
|
-
export * from "./check_where_clause";
|
|
6
|
-
export * from "./extract_event_field";
|
|
7
|
-
export * from "./filter_context";
|
|
8
|
-
export * from "./imports";
|
|
9
|
-
export * from "./make_content_filter";
|
|
10
|
-
export * from "./on_address_space/extract_event_fields";
|
|
11
|
-
export * from "./on_address_space/filter_context_on_address_space";
|
|
12
|
-
export * from "./resolve_operand";
|
|
13
|
-
export * from "./tools_event_filter";
|
|
4
|
+
export * from "./check_event_clause.js";
|
|
5
|
+
export * from "./check_where_clause.js";
|
|
6
|
+
export * from "./extract_event_field.js";
|
|
7
|
+
export * from "./filter_context.js";
|
|
8
|
+
export * from "./imports.js";
|
|
9
|
+
export * from "./make_content_filter.js";
|
|
10
|
+
export * from "./on_address_space/extract_event_fields.js";
|
|
11
|
+
export * from "./on_address_space/filter_context_on_address_space.js";
|
|
12
|
+
export * from "./resolve_operand.js";
|
|
13
|
+
export * from "./tools_event_filter.js";
|
|
14
14
|
|
|
15
15
|
// The SimpleAttributeOperand is a simplified form of the AttributeOperand and all of the rules that
|
|
16
16
|
// apply to the AttributeOperand also apply to the SimpleAttributeOperand. The examples provided in
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
FilterOperator,
|
|
16
16
|
LiteralOperand,
|
|
17
17
|
SimpleAttributeOperand
|
|
18
|
-
} from "./imports";
|
|
18
|
+
} from "./imports.js";
|
|
19
19
|
|
|
20
20
|
export function ofType(nodeId: NodeIdLike): ContentFilterElement {
|
|
21
21
|
const element: ContentFilterElement = new ContentFilterElement({
|
|
@@ -2,8 +2,8 @@ import type { IEventData, ISessionContext } from "node-opcua-address-space-base"
|
|
|
2
2
|
import type { SimpleAttributeOperand } from "node-opcua-types";
|
|
3
3
|
import type { Variant } from "node-opcua-variant";
|
|
4
4
|
//
|
|
5
|
-
import { extractEventFieldsBase } from "../extract_event_field";
|
|
6
|
-
import { FilterContextOnAddressSpace } from "./filter_context_on_address_space";
|
|
5
|
+
import { extractEventFieldsBase } from "../extract_event_field.js";
|
|
6
|
+
import { FilterContextOnAddressSpace } from "./filter_context_on_address_space.js";
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
|
|
@@ -17,7 +17,7 @@ import { coerceNodeId, NodeId, type NodeIdLike, sameNodeId } from "node-opcua-no
|
|
|
17
17
|
import type { BrowsePath } from "node-opcua-types";
|
|
18
18
|
import { DataType, Variant } from "node-opcua-variant";
|
|
19
19
|
//
|
|
20
|
-
import type { FilterContext } from "../filter_context";
|
|
20
|
+
import type { FilterContext } from "../filter_context.js";
|
|
21
21
|
|
|
22
22
|
const warningLog = make_warningLog("Filter");
|
|
23
23
|
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from "./extract_event_fields";
|
|
2
|
-
export * from "./filter_context_on_address_space";
|
|
1
|
+
export * from "./extract_event_fields.js";
|
|
2
|
+
export * from "./filter_context_on_address_space.js";
|
|
@@ -5,7 +5,7 @@ import { constructBrowsePathFromQualifiedName } from "node-opcua-service-transla
|
|
|
5
5
|
import { StatusCodes } from "node-opcua-status-code";
|
|
6
6
|
import { AttributeOperand, SimpleAttributeOperand } from "node-opcua-types";
|
|
7
7
|
import { DataType, Variant } from "node-opcua-variant";
|
|
8
|
-
import type { FilterContext } from "./filter_context";
|
|
8
|
+
import type { FilterContext } from "./filter_context.js";
|
|
9
9
|
|
|
10
10
|
const warningLog = make_warningLog("FILTER");
|
|
11
11
|
const debugLog = make_debugLog("FILTER");
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { ObjectTypeIds } from "node-opcua-constants";
|
|
5
5
|
import { AttributeIds, coerceQualifiedName, type QualifiedName, type QualifiedNameOptions } from "node-opcua-data-model";
|
|
6
6
|
|
|
7
|
-
import { ContentFilter, ContentFilterElement, type ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports";
|
|
7
|
+
import { ContentFilter, ContentFilterElement, type ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports.js";
|
|
8
8
|
|
|
9
9
|
function coerceQualifiedName2(a: string | QualifiedNameOptions) {
|
|
10
10
|
if (typeof a === "string") return coerceQualifiedName(a);
|
|
@@ -12,7 +12,11 @@ function coerceQualifiedName2(a: string | QualifiedNameOptions) {
|
|
|
12
12
|
return coerceQualifiedName(a);
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
// A bare QualifiedNameOptions is accepted, and always was: the last line coerces a
|
|
16
|
+
// single non-array value. Only the signature said otherwise.
|
|
17
|
+
export function constructSimpleBrowsePath(
|
|
18
|
+
a: string | string[] | QualifiedNameOptions | (QualifiedNameOptions | string)[]
|
|
19
|
+
): QualifiedName[] {
|
|
16
20
|
if (typeof a === "string") {
|
|
17
21
|
return constructSimpleBrowsePath(a.split("."));
|
|
18
22
|
}
|
|
@@ -20,7 +24,7 @@ export function constructSimpleBrowsePath(a: string | string[] | (QualifiedNameO
|
|
|
20
24
|
return [coerceQualifiedName2(a)];
|
|
21
25
|
}
|
|
22
26
|
export function constructSelectClause(
|
|
23
|
-
arrayOfNames: string | string[] | (QualifiedNameOptions | string)[][]
|
|
27
|
+
arrayOfNames: string | string[] | QualifiedNameOptions | (QualifiedNameOptions | string)[] | (QualifiedNameOptions | string)[][]
|
|
24
28
|
): SimpleAttributeOperand[] {
|
|
25
29
|
if (!Array.isArray(arrayOfNames)) {
|
|
26
30
|
return constructSelectClause([arrayOfNames]);
|
|
@@ -85,7 +89,12 @@ export function constructSelectClause(
|
|
|
85
89
|
*
|
|
86
90
|
*/
|
|
87
91
|
export function constructEventFilter(
|
|
88
|
-
arrayOfNames:
|
|
92
|
+
arrayOfNames:
|
|
93
|
+
| (QualifiedNameOptions | string)[][]
|
|
94
|
+
| (QualifiedNameOptions | string)[]
|
|
95
|
+
| QualifiedNameOptions
|
|
96
|
+
| string[]
|
|
97
|
+
| string,
|
|
89
98
|
whereClause?: ContentFilterOptions | ContentFilterElement
|
|
90
99
|
): EventFilter {
|
|
91
100
|
const selectClauses = constructSelectClause(arrayOfNames);
|