node-opcua-service-call 2.59.0 → 2.62.4

package/.mocharc.yml

@@ -0,0 +1,10 @@
+require:
+    - ../../node_modules/source-map-support/register
+    - ../../node_modules/ts-node/register
+    - ../../node_modules/should
+timeout: 60000
+extension:
+    - ts
+    - js
+bail: true
+parallel: true

package/dist/imports.js

@@ -14,34 +14,29 @@ Object.defineProperty(exports, "CallMethodRequest", { enumerable: true, get: fun
 Object.defineProperty(exports, "CallRequest", { enumerable: true, get: function () { return node_opcua_types_2.CallRequest; } });
 Object.defineProperty(exports, "CallMethodResult", { enumerable: true, get: function () { return node_opcua_types_2.CallMethodResult; } });
 Object.defineProperty(exports, "CallResponse", { enumerable: true, get: function () { return node_opcua_types_2.CallResponse; } });
-///
-function constructHookArgument(options) {
-    options = options || { dataType: node_opcua_variant_1.DataType.Null };
-    let dataType = options.dataType;
-    if (dataType) {
-        if (typeof dataType === "string") {
-            dataType = (0, node_opcua_nodeid_1.resolveNodeId)(dataType);
-        }
-        else if (dataType instanceof node_opcua_nodeid_1.NodeId) {
-            // nothing
-        }
-        else if (dataType.value) {
-            (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(dataType, "namespace"));
-            dataType = (0, node_opcua_nodeid_1.coerceNodeId)(dataType.value, dataType.namespace);
-        }
-        else {
-            (0, node_opcua_assert_1.assert)(typeof dataType === "number");
-        }
-        options.dataType = dataType;
+function _coerceToNodeId(n) {
+    const dataType = n;
+    if (!dataType) {
+        return new node_opcua_nodeid_1.NodeId();
     }
-    if (options.valueRank === undefined) {
-        options.valueRank = -1;
+    if (typeof dataType === "string") {
+        return (0, node_opcua_nodeid_1.resolveNodeId)(dataType);
     }
-    // fix missing ArrayDimension (The value is an array with one dimension.)
-    if (options.valueRank !== 1 || !options.arrayDimensions) {
-        options.arrayDimensions = [0];
+    if (dataType instanceof node_opcua_nodeid_1.NodeId) {
+        return dataType;
     }
-    return options;
+    if (Object.prototype.hasOwnProperty.call(dataType, "value")) {
+        const a = dataType;
+        return (0, node_opcua_nodeid_1.coerceNodeId)(a.value, a.namespace);
+    }
+    (0, node_opcua_assert_1.assert)(typeof dataType === "number");
+    return (0, node_opcua_nodeid_1.coerceNodeId)(dataType);
+}
+function constructHookArgument(_options) {
+    const options = _options || { valueRank: -1, dataType: node_opcua_variant_1.DataType.Null };
+    const dataType = _coerceToNodeId(options.dataType || node_opcua_variant_1.DataType.Null);
+    (0, node_opcua_variant_1.verifyRankAndDimensions)(options);
+    return Object.assign(Object.assign({}, options), { dataType });
 }
 node_opcua_types_1.Argument.schema.constructHook = constructHookArgument;
 //# sourceMappingURL=imports.js.map

package/dist/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../source/imports.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,yDAAwE;AACxE,uDAA4C;AAC5C,2DAA8C;AAE9C,qDAU0B;AATtB,4GAAA,QAAQ,OAAA;AAER,qHAAA,iBAAiB,OAAA;AAEjB,+GAAA,WAAW,OAAA;AAEX,oHAAA,gBAAgB,OAAA;AAEhB,gHAAA,YAAY,OAAA;AAGhB,GAAG;AACH,SAAS,qBAAqB,CAAC,OAAsE;IACjG,OAAO,GAAG,OAAO,IAAI,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,CAAC;IAEjD,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACV,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAC9B,QAAQ,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAC;SACtC;aAAM,IAAI,QAAQ,YAAY,0BAAM,EAAE;YACnC,UAAU;SACb;aAAM,IAAI,QAAQ,CAAC,KAAK,EAAE;YACvB,IAAA,0BAAM,EAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;YACpE,QAAQ,GAAG,IAAA,gCAAY,EAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;SAC/D;aAAM;YACH,IAAA,0BAAM,EAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC;SACxC;QACD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;KAC/B;IACD,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;KAC1B;IACD,yEAAyE;IACzE,IAAI,OAAO,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QACrD,OAAO,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC;KACjC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,2BAAQ,CAAC,MAAM,CAAC,aAAa,GAAG,qBAAqB,CAAC"}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../source/imports.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,yDAAoF;AACpF,uDAA4C;AAC5C,2DAAuE;AAEvE,qDAU0B;AATtB,4GAAA,QAAQ,OAAA;AAER,qHAAA,iBAAiB,OAAA;AAEjB,+GAAA,WAAW,OAAA;AAEX,oHAAA,gBAAgB,OAAA;AAEhB,gHAAA,YAAY,OAAA;AAchB,SAAS,eAAe,CAAC,CAA6B;IAClD,MAAM,QAAQ,GAA+B,CAAC,CAAC;IAE/C,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,IAAI,0BAAM,EAAE,CAAC;KACvB;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC9B,OAAO,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAC;KAClC;IACD,IAAI,QAAQ,YAAY,0BAAM,EAAE;QAC5B,OAAO,QAAQ,CAAC;KACnB;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACzD,MAAM,CAAC,GAAG,QAA6D,CAAC;QACxE,OAAO,IAAA,gCAAY,EAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;KAC7C;IACD,IAAA,0BAAM,EAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC;IACrC,OAAO,IAAA,gCAAY,EAAC,QAAQ,CAAC,CAAC;AAClC,CAAC;AACD,SAAS,qBAAqB,CAAC,QAAuC;IAClE,MAAM,OAAO,GAAG,QAAQ,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,CAAC;IAEvE,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,IAAI,6BAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,IAAA,4CAAuB,EAAC,OAAO,CAAC,CAAC;IACjC,uCAAY,OAAO,KAAE,QAAQ,IAAG;AACpC,CAAC;AAED,2BAAQ,CAAC,MAAM,CAAC,aAAa,GAAG,qBAAqB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-service-call",
-    "version": "2.59.0",
+    "version": "2.62.4",
     "description": "pure nodejs OPCUA SDK - module -service-call",
     "scripts": {
         "test": "mocha",
@@ -13,16 +13,16 @@
     "types": "./dist/index.d.ts",
     "dependencies": {
         "node-opcua-assert": "2.55.0",
-        "node-opcua-basic-types": "2.57.0",
+        "node-opcua-basic-types": "2.62.4",
         "node-opcua-binary-stream": "2.55.0",
-        "node-opcua-factory": "2.57.0",
-        "node-opcua-nodeid": "2.55.0",
-        "node-opcua-service-secure-channel": "2.59.0",
-        "node-opcua-types": "2.59.0",
-        "node-opcua-variant": "2.59.0"
+        "node-opcua-factory": "2.62.4",
+        "node-opcua-nodeid": "2.62.4",
+        "node-opcua-service-secure-channel": "2.62.4",
+        "node-opcua-types": "2.62.4",
+        "node-opcua-variant": "2.62.4"
     },
     "devDependencies": {
-        "node-opcua-packet-analyzer": "2.57.0",
+        "node-opcua-packet-analyzer": "2.62.4",
         "node-opcua-status-code": "2.56.0",
         "should": "^13.2.3"
     },
@@ -41,5 +41,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "ea10265745d3d4b8af249a4e13288ad71232706f"
+    "gitHead": "b4cb2b2e4ce2b141614dbcb02a3e385c747ac1a1"
 }

package/source/imports.ts

@@ -2,9 +2,9 @@
  * @module node-opcua-service-browse
  */
 import { assert } from "node-opcua-assert";
-import { coerceNodeId, NodeId, resolveNodeId } from "node-opcua-nodeid";
+import { coerceNodeId, NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
 import { Argument } from "node-opcua-types";
-import { DataType } from "node-opcua-variant";
+import { DataType, verifyRankAndDimensions } from "node-opcua-variant";
 
 export {
     Argument,
@@ -19,32 +19,41 @@ export {
 } from "node-opcua-types";
 
 ///
-function constructHookArgument(options?: { dataType: any; valueRank?: number; arrayDimensions?: any }): any {
-    options = options || { dataType: DataType.Null };
+interface constructHookArgumentOptions {
+    dataType: DataType | NodeIdLike | string;
+    valueRank?: number;
+    arrayDimensions?: number[];
+}
+interface constructHookArgumentOptions2 {
+    dataType: NodeId;
+    valueRank?: number;
+    arrayDimensions?: number[];
+}
+function _coerceToNodeId(n: NodeId | string | DataType): NodeId {
+    const dataType: NodeId | string | DataType = n;
 
-    let dataType = options.dataType;
-    if (dataType) {
-        if (typeof dataType === "string") {
-            dataType = resolveNodeId(dataType);
-        } else if (dataType instanceof NodeId) {
-            // nothing
-        } else if (dataType.value) {
-            assert(Object.prototype.hasOwnProperty.call(dataType, "namespace"));
-            dataType = coerceNodeId(dataType.value, dataType.namespace);
-        } else {
-            assert(typeof dataType === "number");
-        }
-        options.dataType = dataType;
+    if (!dataType) {
+        return new NodeId();
     }
-    if (options.valueRank === undefined) {
-        options.valueRank = -1;
+    if (typeof dataType === "string") {
+        return resolveNodeId(dataType);
     }
-    // fix missing ArrayDimension (The value is an array with one dimension.)
-    if (options.valueRank !== 1 || !options.arrayDimensions) {
-        options.arrayDimensions = [0];
+    if (dataType instanceof NodeId) {
+        return dataType;
     }
+    if (Object.prototype.hasOwnProperty.call(dataType, "value")) {
+        const a = dataType as unknown as { value: unknown; namespace?: number };
+        return coerceNodeId(a.value, a.namespace);
+    }
+    assert(typeof dataType === "number");
+    return coerceNodeId(dataType);
+}
+function constructHookArgument(_options?: constructHookArgumentOptions): constructHookArgumentOptions2 {
+    const options = _options || { valueRank: -1, dataType: DataType.Null };
 
-    return options;
+    const dataType = _coerceToNodeId(options.dataType || DataType.Null);
+    verifyRankAndDimensions(options);
+    return { ...options, dataType };
 }
 
 Argument.schema.constructHook = constructHookArgument;