node-opcua-service-filter 2.97.0 → 2.98.1

package/dist/resolve_operand.js

@@ -1,45 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveOperand = void 0;
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
-const node_opcua_status_code_1 = require("node-opcua-status-code");
-const node_opcua_types_1 = require("node-opcua-types");
-const node_opcua_variant_1 = require("node-opcua-variant");
-const warningLog = (0, node_opcua_debug_1.make_warningLog)("FILTER");
-// export function readOperand(context: FilterContext, operand: SimpleAttributeOperand): Variant {
-//     // navigate to the innerNode specified by the browsePath [ QualifiedName]
-//     const browsePath = constructBrowsePathFromQualifiedName({ nodeId: context.eventSource }, operand.browsePath);
-//     const targetNode = context.browsePath(browsePath);
-//     if (!targetNode) {
-//         return new Variant({ dataType: DataType.Null });
-//     }
-//     return context.readNodeValue(targetNode);
-// }
-function resolveOperand(context, operand) {
-    if (operand instanceof node_opcua_types_1.SimpleAttributeOperand) {
-        const browsePath = (0, node_opcua_service_translate_browse_path_1.constructBrowsePathFromQualifiedName)({ nodeId: context.eventSource }, operand.browsePath);
-        const target = context.browsePath(browsePath);
-        if (!target) {
-            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
-            // return new Variant({ dataType: DataType.StatusCode, value: StatusCodes.BadNodeIdUnknown });
-        }
-        const nodeClass = context.getNodeClass(target);
-        if (nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
-            warningLog("resolveOperand: cannot find variable here but got nodeClass", node_opcua_data_model_1.NodeClass[nodeClass], browsePath.toString());
-            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.StatusCode, value: node_opcua_status_code_1.StatusCodes.BadNodeClassInvalid });
-        }
-        const value = context.readNodeValue(target);
-        return value;
-    }
-    else {
-        if (!(operand instanceof node_opcua_types_1.AttributeOperand)) {
-            throw new Error("expecting an AttributeOperand");
-        }
-        warningLog("AttributeOperand is not yet implemented");
-        return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
-    }
-}
-exports.resolveOperand = resolveOperand;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOperand = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+const node_opcua_types_1 = require("node-opcua-types");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const warningLog = (0, node_opcua_debug_1.make_warningLog)("FILTER");
+// export function readOperand(context: FilterContext, operand: SimpleAttributeOperand): Variant {
+//     // navigate to the innerNode specified by the browsePath [ QualifiedName]
+//     const browsePath = constructBrowsePathFromQualifiedName({ nodeId: context.eventSource }, operand.browsePath);
+//     const targetNode = context.browsePath(browsePath);
+//     if (!targetNode) {
+//         return new Variant({ dataType: DataType.Null });
+//     }
+//     return context.readNodeValue(targetNode);
+// }
+function resolveOperand(context, operand) {
+    if (operand instanceof node_opcua_types_1.SimpleAttributeOperand) {
+        const browsePath = (0, node_opcua_service_translate_browse_path_1.constructBrowsePathFromQualifiedName)({ nodeId: context.eventSource }, operand.browsePath);
+        const target = context.browsePath(browsePath);
+        if (!target) {
+            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
+            // return new Variant({ dataType: DataType.StatusCode, value: StatusCodes.BadNodeIdUnknown });
+        }
+        const nodeClass = context.getNodeClass(target);
+        if (nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
+            warningLog("resolveOperand: cannot find variable here but got nodeClass", node_opcua_data_model_1.NodeClass[nodeClass], browsePath.toString());
+            return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.StatusCode, value: node_opcua_status_code_1.StatusCodes.BadNodeClassInvalid });
+        }
+        const value = context.readNodeValue(target);
+        return value;
+    }
+    else {
+        if (!(operand instanceof node_opcua_types_1.AttributeOperand)) {
+            throw new Error("expecting an AttributeOperand");
+        }
+        warningLog("AttributeOperand is not yet implemented");
+        return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.Null });
+    }
+}
+exports.resolveOperand = resolveOperand;
 //# sourceMappingURL=resolve_operand.js.map

package/dist/tools_event_filter.d.ts

@@ -1,20 +1,20 @@
-import { ContentFilterElement, ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports";
-export declare function constructSelectClause(arrayOfNames: string | string[]): SimpleAttributeOperand[];
-/**
- * helper to construct event filters:
- * construct a simple event filter
- *
- *  "ConditionId" in the arrayOfNames has a special meaning
- *
- * @example
- *
- *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
- *
- *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
- *     constructEventFilter(["SourceName","2:MyData" ]);
- *
- *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
- *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
- *
- */
-export declare function constructEventFilter(arrayOfNames: string[] | string, whereClause?: ContentFilterOptions | ContentFilterElement): EventFilter;
+import { ContentFilterElement, ContentFilterOptions, EventFilter, SimpleAttributeOperand } from "./imports";
+export declare function constructSelectClause(arrayOfNames: string | string[]): SimpleAttributeOperand[];
+/**
+ * helper to construct event filters:
+ * construct a simple event filter
+ *
+ *  "ConditionId" in the arrayOfNames has a special meaning
+ *
+ * @example
+ *
+ *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
+ *
+ *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
+ *     constructEventFilter(["SourceName","2:MyData" ]);
+ *
+ *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
+ *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
+ *
+ */
+export declare function constructEventFilter(arrayOfNames: string[] | string, whereClause?: ContentFilterOptions | ContentFilterElement): EventFilter;

package/dist/tools_event_filter.js

@@ -1,90 +1,90 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.constructEventFilter = exports.constructSelectClause = void 0;
-/**
- * @module node-opcua-service-filter
- */
-const node_opcua_constants_1 = require("node-opcua-constants");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const imports_1 = require("./imports");
-function constructSelectClause(arrayOfNames) {
-    if (!Array.isArray(arrayOfNames)) {
-        return constructSelectClause([arrayOfNames]);
-    }
-    // replace "string" element in the form A.B.C into [ "A","B","C"]
-    const arrayOfNames2 = arrayOfNames.map((path) => (typeof path !== "string" ? path : path.split(".")));
-    const arrayOfNames3 = arrayOfNames2.map((path) => (Array.isArray(path) ? path.map(node_opcua_data_model_1.stringToQualifiedName) : path));
-    // replace "string" elements in arrayOfName with QualifiedName in namespace 0
-    const arrayOfNames4 = arrayOfNames3.map((s) => (typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s));
-    // construct browse paths array
-    const browsePaths = arrayOfNames4.map((s) => (Array.isArray(s) ? s : [s]));
-    // Part 4 page 127:
-    // In some cases the same BrowsePath will apply to multiple EventTypes. If the Client specifies the BaseEventType
-    // in the SimpleAttributeOperand then the Server shall evaluate the BrowsePath without considering the Type.
-    const isBrowsePathForConditionId = (browsePath) => browsePath.length === 1 && browsePath[0].namespaceIndex === 0 && browsePath[0].name === "ConditionId";
-    // [..]
-    // The SimpleAttributeOperand structure allows the Client to specify any Attribute, however, the Server is only
-    // required to support the Value Attribute for Variable Nodes and the NodeId Attribute for Object Nodes.
-    // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
-    const selectClauses = browsePaths.map((browsePath) => {
-        if (isBrowsePathForConditionId(browsePath)) {
-            // special case
-            //
-            // The NodeId of the Condition instance is used as ConditionId. It is not explicitly modelled as a
-            // component of the ConditionType. However, it can be requested with the following
-            // SimpleAttributeOperand (see Table 10) in the SelectClause of the EventFilter:
-            //
-            //  SimpleAttributeOperand
-            //  Name          Type          Description
-            //  typeId        NodeId        NodeId of the ConditionType Node
-            //  browsePath[]  QualifiedName empty
-            //  attributeId   IntegerId     Id of the NodeId Attribute
-            //
-            return new imports_1.SimpleAttributeOperand({
-                attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
-                browsePath: null,
-                indexRange: undefined,
-                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.ConditionType // i=2782
-            });
-        }
-        else
-            return new imports_1.SimpleAttributeOperand({
-                attributeId: node_opcua_data_model_1.AttributeIds.Value,
-                browsePath,
-                indexRange: undefined,
-                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.BaseEventType // i=2041
-            });
-    });
-    return selectClauses;
-}
-exports.constructSelectClause = constructSelectClause;
-/**
- * helper to construct event filters:
- * construct a simple event filter
- *
- *  "ConditionId" in the arrayOfNames has a special meaning
- *
- * @example
- *
- *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
- *
- *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
- *     constructEventFilter(["SourceName","2:MyData" ]);
- *
- *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
- *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
- *
- */
-function constructEventFilter(arrayOfNames, whereClause) {
-    const selectClauses = constructSelectClause(arrayOfNames);
-    if (whereClause instanceof imports_1.ContentFilterElement) {
-        whereClause = new imports_1.ContentFilter({ elements: [whereClause] });
-    }
-    const filter = new imports_1.EventFilter({
-        selectClauses,
-        whereClause
-    });
-    return filter;
-}
-exports.constructEventFilter = constructEventFilter;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructEventFilter = exports.constructSelectClause = void 0;
+/**
+ * @module node-opcua-service-filter
+ */
+const node_opcua_constants_1 = require("node-opcua-constants");
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const imports_1 = require("./imports");
+function constructSelectClause(arrayOfNames) {
+    if (!Array.isArray(arrayOfNames)) {
+        return constructSelectClause([arrayOfNames]);
+    }
+    // replace "string" element in the form A.B.C into [ "A","B","C"]
+    const arrayOfNames2 = arrayOfNames.map((path) => (typeof path !== "string" ? path : path.split(".")));
+    const arrayOfNames3 = arrayOfNames2.map((path) => (Array.isArray(path) ? path.map(node_opcua_data_model_1.stringToQualifiedName) : path));
+    // replace "string" elements in arrayOfName with QualifiedName in namespace 0
+    const arrayOfNames4 = arrayOfNames3.map((s) => (typeof s === "string" ? (0, node_opcua_data_model_1.stringToQualifiedName)(s) : s));
+    // construct browse paths array
+    const browsePaths = arrayOfNames4.map((s) => (Array.isArray(s) ? s : [s]));
+    // Part 4 page 127:
+    // In some cases the same BrowsePath will apply to multiple EventTypes. If the Client specifies the BaseEventType
+    // in the SimpleAttributeOperand then the Server shall evaluate the BrowsePath without considering the Type.
+    const isBrowsePathForConditionId = (browsePath) => browsePath.length === 1 && browsePath[0].namespaceIndex === 0 && browsePath[0].name === "ConditionId";
+    // [..]
+    // The SimpleAttributeOperand structure allows the Client to specify any Attribute, however, the Server is only
+    // required to support the Value Attribute for Variable Nodes and the NodeId Attribute for Object Nodes.
+    // That said, profiles defined in Part 7 may make support for additional Attributes mandatory.
+    const selectClauses = browsePaths.map((browsePath) => {
+        if (isBrowsePathForConditionId(browsePath)) {
+            // special case
+            //
+            // The NodeId of the Condition instance is used as ConditionId. It is not explicitly modelled as a
+            // component of the ConditionType. However, it can be requested with the following
+            // SimpleAttributeOperand (see Table 10) in the SelectClause of the EventFilter:
+            //
+            //  SimpleAttributeOperand
+            //  Name          Type          Description
+            //  typeId        NodeId        NodeId of the ConditionType Node
+            //  browsePath[]  QualifiedName empty
+            //  attributeId   IntegerId     Id of the NodeId Attribute
+            //
+            return new imports_1.SimpleAttributeOperand({
+                attributeId: node_opcua_data_model_1.AttributeIds.NodeId,
+                browsePath: null,
+                indexRange: undefined,
+                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.ConditionType // i=2782
+            });
+        }
+        else
+            return new imports_1.SimpleAttributeOperand({
+                attributeId: node_opcua_data_model_1.AttributeIds.Value,
+                browsePath,
+                indexRange: undefined,
+                typeDefinitionId: node_opcua_constants_1.ObjectTypeIds.BaseEventType // i=2041
+            });
+    });
+    return selectClauses;
+}
+exports.constructSelectClause = constructSelectClause;
+/**
+ * helper to construct event filters:
+ * construct a simple event filter
+ *
+ *  "ConditionId" in the arrayOfNames has a special meaning
+ *
+ * @example
+ *
+ *     constructEventFilter(["SourceName","Message","ReceiveTime"]);
+ *
+ *     constructEventFilter(["SourceName",{namespaceIndex:2 , "MyData"}]);
+ *     constructEventFilter(["SourceName","2:MyData" ]);
+ *
+ *     constructEventFilter(["SourceName" ,["EnabledState","EffectiveDisplayName"] ]);
+ *     constructEventFilter(["SourceName" ,"EnabledState.EffectiveDisplayName" ]);
+ *
+ */
+function constructEventFilter(arrayOfNames, whereClause) {
+    const selectClauses = constructSelectClause(arrayOfNames);
+    if (whereClause instanceof imports_1.ContentFilterElement) {
+        whereClause = new imports_1.ContentFilter({ elements: [whereClause] });
+    }
+    const filter = new imports_1.EventFilter({
+        selectClauses,
+        whereClause
+    });
+    return filter;
+}
+exports.constructEventFilter = constructEventFilter;
 //# sourceMappingURL=tools_event_filter.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-opcua-service-filter",
-    "version": "2.97.0",
-    "description": "pure nodejs OPCUA SDK - module -service-filter",
+    "version": "2.98.1",
+    "description": "pure nodejs OPCUA SDK - module service-filter",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {
@@ -10,23 +10,23 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "node-opcua-address-space-base": "2.97.0",
-        "node-opcua-assert": "2.88.0",
-        "node-opcua-basic-types": "2.97.0",
-        "node-opcua-constants": "2.88.0",
-        "node-opcua-data-model": "2.97.0",
-        "node-opcua-data-value": "2.97.0",
-        "node-opcua-debug": "2.90.1",
-        "node-opcua-extension-object": "2.97.0",
-        "node-opcua-nodeid": "2.97.0",
-        "node-opcua-service-translate-browse-path": "2.97.0",
-        "node-opcua-status-code": "2.90.1",
-        "node-opcua-types": "2.97.0",
-        "node-opcua-variant": "2.97.0"
+        "node-opcua-address-space-base": "2.98.1",
+        "node-opcua-assert": "2.98.1",
+        "node-opcua-basic-types": "2.98.1",
+        "node-opcua-constants": "2.98.1",
+        "node-opcua-data-model": "2.98.1",
+        "node-opcua-data-value": "2.98.1",
+        "node-opcua-debug": "2.98.1",
+        "node-opcua-extension-object": "2.98.1",
+        "node-opcua-nodeid": "2.98.1",
+        "node-opcua-service-translate-browse-path": "2.98.1",
+        "node-opcua-status-code": "2.98.1",
+        "node-opcua-types": "2.98.1",
+        "node-opcua-variant": "2.98.1"
     },
     "devDependencies": {
-        "node-opcua-numeric-range": "2.97.0",
-        "node-opcua-packet-analyzer": "2.97.0",
+        "node-opcua-numeric-range": "2.98.1",
+        "node-opcua-packet-analyzer": "2.98.1",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -44,5 +44,9 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "19c96bda0810d2dec73dd1c2427546be40908646"
+    "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c",
+    "files": [
+        "dist",
+        "source"
+    ]
 }