node-opcua-address-space 2.113.0 → 2.114.0

package/dist/source/helpers/call_helpers.js

@@ -44,7 +44,6 @@ function callMethodHelper(context, addressSpace, callMethodRequest, callback) {
     (0, resolve_opaque_on_address_space_1.resolveOpaqueOnAddressSpace)(addressSpace, inputArguments)
         .then(() => {
         methodObj.execute(object, inputArguments, context, (err, callMethodResponse) => {
-            var _a;
             /* istanbul ignore next */
             if (err) {
                 return callback(err);
@@ -55,7 +54,7 @@ function callMethodHelper(context, addressSpace, callMethodRequest, callback) {
             callMethodResponse.inputArgumentResults =
                 callMethodResponse.inputArgumentResults || response.inputArgumentResults || [];
             (0, node_opcua_assert_1.assert)(callMethodResponse.statusCode);
-            if ((_a = callMethodResponse.statusCode) === null || _a === void 0 ? void 0 : _a.isGood()) {
+            if (callMethodResponse.statusCode?.isGood()) {
                 (0, node_opcua_assert_1.assert)(Array.isArray(callMethodResponse.outputArguments));
             }
             (0, node_opcua_assert_1.assert)(Array.isArray(callMethodResponse.inputArgumentResults));

package/dist/source/helpers/call_helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../source/helpers/call_helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../source/helpers/call_helpers.ts"],"names":[],"mappings":"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"}

package/dist/source/helpers/resolve_opaque_on_address_space.js

@@ -1,37 +1,26 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveOpaqueOnAddressSpace = void 0;
 const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
 const node_opcua_variant_1 = require("node-opcua-variant");
 const pseudo_session_1 = require("../pseudo_session");
 const ensure_datatype_extracted_1 = require("../loader/ensure_datatype_extracted");
-function resolveOpaqueOnAddressSpace(addressSpace, variants) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!variants) {
-            return;
+async function resolveOpaqueOnAddressSpace(addressSpace, variants) {
+    if (!variants) {
+        return;
+    }
+    const session = new pseudo_session_1.PseudoSession(addressSpace);
+    const extraDataTypeManager = await (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
+    if (variants instanceof node_opcua_variant_1.Variant) {
+        await (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variants, extraDataTypeManager);
+        return;
+    }
+    // resolve opaque data structure from inputArguments
+    for (const variant of variants) {
+        if (variant) {
+            await (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variant, extraDataTypeManager);
         }
-        const session = new pseudo_session_1.PseudoSession(addressSpace);
-        const extraDataTypeManager = yield (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
-        if (variants instanceof node_opcua_variant_1.Variant) {
-            yield (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variants, extraDataTypeManager);
-            return;
-        }
-        // resolve opaque data structure from inputArguments
-        for (const variant of variants) {
-            if (variant) {
-                yield (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variant, extraDataTypeManager);
-            }
-        }
-    });
+    }
 }
 exports.resolveOpaqueOnAddressSpace = resolveOpaqueOnAddressSpace;
 //# sourceMappingURL=resolve_opaque_on_address_space.js.map

package/dist/source/helpers/resolve_opaque_on_address_space.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_opaque_on_address_space.js","sourceRoot":"","sources":["../../../source/helpers/resolve_opaque_on_address_space.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2GAA2F;AAC3F,2DAA6C;AAE7C,sDAAkD;AAClD,mFAA8E;AAE9E,SAAsB,2BAA2B,CAC7C,YAA2B,EAC3B,QAA+C;;QAE/C,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO;SACV;QACD,MAAM,OAAO,GAAG,IAAI,8BAAa,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,oBAAoB,GAAG,MAAM,IAAA,mDAAuB,EAAC,YAAY,CAAC,CAAC;QACzE,IAAI,QAAQ,YAAY,4BAAO,EAAE;YAC7B,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;YAC7E,OAAO;SACV;QACD,oDAAoD;QACpD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,EAAE;gBACT,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;aAC/E;SACJ;IACL,CAAC;CAAA;AAnBD,kEAmBC"}
+{"version":3,"file":"resolve_opaque_on_address_space.js","sourceRoot":"","sources":["../../../source/helpers/resolve_opaque_on_address_space.ts"],"names":[],"mappings":";;;AAAA,2GAA2F;AAC3F,2DAA6C;AAE7C,sDAAkD;AAClD,mFAA8E;AAEvE,KAAK,UAAU,2BAA2B,CAC7C,YAA2B,EAC3B,QAA+C;IAE/C,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO;KACV;IACD,MAAM,OAAO,GAAG,IAAI,8BAAa,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,oBAAoB,GAAG,MAAM,IAAA,mDAAuB,EAAC,YAAY,CAAC,CAAC;IACzE,IAAI,QAAQ,YAAY,4BAAO,EAAE;QAC7B,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QAC7E,OAAO;KACV;IACD,oDAAoD;IACpD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC5B,IAAI,OAAO,EAAE;YACT,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;SAC/E;KACJ;AACL,CAAC;AAnBD,kEAmBC"}

package/dist/source/loader/ensure_datatype_extracted.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDatatypeExtractedWithCallback = exports.ensureDatatypeExtracted = void 0;
 const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
@@ -38,28 +29,26 @@ function fixDefinition103(addressSpace, namespaceArray, dataTypeManager) {
         }
     }
 }
-function ensureDatatypeExtracted(addressSpace) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const addressSpacePriv = addressSpace;
-        if (!addressSpacePriv.$$extraDataTypeManager) {
-            const dataTypeManager = new node_opcua_client_dynamic_extension_object_1.ExtraDataTypeManager();
-            const namespaceArray = addressSpace.getNamespaceArray().map((n) => n.namespaceUri);
-            debugLog("INamespace Array = ", namespaceArray.join("\n                   "));
-            dataTypeManager.setNamespaceArray(namespaceArray);
-            addressSpacePriv.$$extraDataTypeManager = dataTypeManager;
-            for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
-                const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
-                dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
-            }
-            // inject simple types
-            // now extract structure and enumeration from old form
-            const session = new pseudo_session_1.PseudoSession(addressSpace);
-            yield (0, node_opcua_client_dynamic_extension_object_1.populateDataTypeManager)(session, dataTypeManager);
-            // turn old <=103 structure to have valid DataTypeDefinition
-            fixDefinition103(addressSpace, namespaceArray, dataTypeManager);
+async function ensureDatatypeExtracted(addressSpace) {
+    const addressSpacePriv = addressSpace;
+    if (!addressSpacePriv.$$extraDataTypeManager) {
+        const dataTypeManager = new node_opcua_client_dynamic_extension_object_1.ExtraDataTypeManager();
+        const namespaceArray = addressSpace.getNamespaceArray().map((n) => n.namespaceUri);
+        debugLog("INamespace Array = ", namespaceArray.join("\n                   "));
+        dataTypeManager.setNamespaceArray(namespaceArray);
+        addressSpacePriv.$$extraDataTypeManager = dataTypeManager;
+        for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
+            const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
+            dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
         }
-        return addressSpacePriv.$$extraDataTypeManager;
-    });
+        // inject simple types
+        // now extract structure and enumeration from old form
+        const session = new pseudo_session_1.PseudoSession(addressSpace);
+        await (0, node_opcua_client_dynamic_extension_object_1.populateDataTypeManager)(session, dataTypeManager);
+        // turn old <=103 structure to have valid DataTypeDefinition
+        fixDefinition103(addressSpace, namespaceArray, dataTypeManager);
+    }
+    return addressSpacePriv.$$extraDataTypeManager;
 }
 exports.ensureDatatypeExtracted = ensureDatatypeExtracted;
 function ensureDatatypeExtractedWithCallback(addressSpace, callback) {

package/dist/source/loader/ensure_datatype_extracted.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../source/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../source/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":";;;AACA,2GAIoD;AACpD,uDAAiD;AACjD,2DAAiF;AAIjF,sDAAkD;AAElD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAM3C,SAAS,gBAAgB,CAAC,YAA2B,EAAE,cAAwB,EAAE,eAAqC;IAClH,iCAAiC;IACjC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;QACnF,MAAM,EAAE,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAmB,CAAC;YACtF,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;gBAChB,SAAS;aACZ;YACD,IAAI,CAAC,QAAQ,EAAE;gBACX,SAAS;aACZ;YACD,IAAI,QAAQ,CAAC,kBAAkB,IAAI,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE;gBACnE,SAAS;aACZ;YACD,6DAA6D;YAC7D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;gBAC3G,MAAM,EAAE,GAAG,IAAA,4FAA+C,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACrE,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC,MAAM,IAAI,SAAS,CAAC;aACxD;SACJ;KACJ;AACL,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAC,YAA2B;IACrE,MAAM,gBAAgB,GAAQ,YAAmC,CAAC;IAClE,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE;QAC1C,MAAM,eAAe,GAAG,IAAI,iEAAoB,EAAE,CAAC;QAEnD,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAC/F,QAAQ,CAAC,qBAAqB,EAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAC9E,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAClD,gBAAgB,CAAC,sBAAsB,GAAG,eAAe,CAAC;QAE1D,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;YACnF,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC,CAAC;YAC7E,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;SAC7E;QACD,sBAAsB;QAEtB,sDAAsD;QACtD,MAAM,OAAO,GAAG,IAAI,8BAAa,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,IAAA,oEAAuB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAExD,4DAA4D;QAC5D,gBAAgB,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;KACnE;IACD,OAAO,gBAAgB,CAAC,sBAAsB,CAAC;AACnD,CAAC;AAxBD,0DAwBC;AAED,SAAgB,mCAAmC,CAAC,YAA2B,EAAE,QAAyC;IACtH,uBAAuB,CAAC,YAAY,CAAC;SAChC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC9D,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACvC,CAAC;AAJD,kFAIC"}

package/dist/source/loader/generateAddressSpaceRaw.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAddressSpaceRaw = void 0;
 const node_opcua_debug_1 = require("node-opcua-debug");
@@ -21,26 +12,24 @@ const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
  * @xmlFiles: a lis of xml files
  * @param xmlLoader - a helper function to return the content of the xml file
  */
-function generateAddressSpaceRaw(addressSpace, xmlFiles, xmlLoader, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nodesetLoader = new load_nodeset2_1.NodeSetLoader(addressSpace, options);
-        if (!Array.isArray(xmlFiles)) {
-            xmlFiles = [xmlFiles];
+async function generateAddressSpaceRaw(addressSpace, xmlFiles, xmlLoader, options) {
+    const nodesetLoader = new load_nodeset2_1.NodeSetLoader(addressSpace, options);
+    if (!Array.isArray(xmlFiles)) {
+        xmlFiles = [xmlFiles];
+    }
+    for (let index = 0; index < xmlFiles.length; index++) {
+        const xmlData = await xmlLoader(xmlFiles[index]);
+        try {
+            await nodesetLoader.addNodeSetAsync(xmlData);
         }
-        for (let index = 0; index < xmlFiles.length; index++) {
-            const xmlData = yield xmlLoader(xmlFiles[index]);
-            try {
-                yield nodesetLoader.addNodeSetAsync(xmlData);
-            }
-            catch (err) {
-                errorLog("generateAddressSpace:  Loading xml file ", xmlFiles[index], " failed with error ", err.message);
-                throw err;
-            }
+        catch (err) {
+            errorLog("generateAddressSpace:  Loading xml file ", xmlFiles[index], " failed with error ", err.message);
+            throw err;
         }
-        yield nodesetLoader.terminateAsync();
-        (0, adjust_namespace_array_1.adjustNamespaceArray)(addressSpace);
-        // however process them in series
-    });
+    }
+    await nodesetLoader.terminateAsync();
+    (0, adjust_namespace_array_1.adjustNamespaceArray)(addressSpace);
+    // however process them in series
 }
 exports.generateAddressSpaceRaw = generateAddressSpaceRaw;
 //# sourceMappingURL=generateAddressSpaceRaw.js.map

package/dist/source/loader/generateAddressSpaceRaw.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateAddressSpaceRaw.js","sourceRoot":"","sources":["../../../source/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAgF;AAIhF,2FAAsF;AAEtF,mDAAgD;AAEhD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C;;;;GAIG;AACH,SAAsB,uBAAuB,CACzC,YAA2B,EAC3B,QAA2B,EAC3B,SAAsD,EACtD,OAA6B;;QAE7B,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAE/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;SACzB;QACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAClD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACjD,IAAI;gBACA,MAAM,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;aAChD;YAAC,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,0CAA0C,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;gBACrH,MAAM,GAAG,CAAC;aACb;SACJ;QACD,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;QACrC,IAAA,6CAAoB,EAAC,YAAY,CAAC,CAAC;QACnC,iCAAiC;IACrC,CAAC;CAAA;AAvBD,0DAuBC"}
+{"version":3,"file":"generateAddressSpaceRaw.js","sourceRoot":"","sources":["../../../source/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":";;;AAAA,uDAAgF;AAIhF,2FAAsF;AAEtF,mDAAgD;AAEhD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CACzC,YAA2B,EAC3B,QAA2B,EAC3B,SAAsD,EACtD,OAA6B;IAE7B,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC1B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;KACzB;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAClD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI;YACA,MAAM,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SAChD;QAAC,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,0CAA0C,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACrH,MAAM,GAAG,CAAC;SACb;KACJ;IACD,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;IACrC,IAAA,6CAAoB,EAAC,YAAY,CAAC,CAAC;IACnC,iCAAiC;AACrC,CAAC;AAvBD,0DAuBC"}

package/dist/source/loader/load_nodeset2.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -430,7 +421,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
             });
             this.obj.partialDefinition = definitionFields;
             let capturedDataTypeNode = _internal_createNode(this.obj);
-            const processBasicDataType = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+            const processBasicDataType = async (addressSpace2) => {
                 const definitionName = capturedDataTypeNode.browseName.name;
                 const isStructure = capturedDataTypeNode.isStructure();
                 const isEnumeration = capturedDataTypeNode.isEnumeration();
@@ -439,7 +430,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
                     pendingSimpleTypeToRegister.push({ name: definitionName, dataTypeNodeId: capturedDataTypeNode.nodeId });
                 }
                 capturedDataTypeNode = undefined;
-            });
+            };
             postTasks.push(processBasicDataType);
         },
         parser: {
@@ -520,22 +511,29 @@ function makeNodeSetParserEngine(addressSpace, options) {
                 this.enumValueType = new node_opcua_types_1.EnumValueType({
                     description: undefined,
                     displayName: undefined,
-                    value: [0, 0] // Int64
+                    value: (0, node_opcua_basic_types_2.coerceInt64)(-1)
                 });
             },
             parser: {
                 Value: {
+                    // note: Value may be missing, in this case value shall be set to -1(64)
                     finish() {
                         // Low part
                         this.parent.enumValueType.value = (0, node_opcua_basic_types_2.coerceInt64)(parseInt(this.text, 10));
                     }
                 },
-                DisplayName: Object.assign(Object.assign({}, localizedText_parser.LocalizedText), { finish() {
-                        this.parent.enumValueType.displayName = Object.assign({}, this.localizedText);
-                    } }),
-                Description: Object.assign(Object.assign({}, localizedText_parser.LocalizedText), { finish() {
-                        this.parent.enumValueType.description = Object.assign({}, this.localizedText);
-                    } })
+                DisplayName: {
+                    ...localizedText_parser.LocalizedText,
+                    finish() {
+                        this.parent.enumValueType.displayName = { ...this.localizedText };
+                    }
+                },
+                Description: {
+                    ...localizedText_parser.LocalizedText,
+                    finish() {
+                        this.parent.enumValueType.description = { ...this.localizedText };
+                    }
+                }
             },
             finish() {
                 this.enumValueType = new node_opcua_types_1.EnumValueType(this.enumValueType);
@@ -639,12 +637,18 @@ function makeNodeSetParserEngine(addressSpace, options) {
                         this.parent.euInformation.unitId = parseInt(this.text, 10);
                     }
                 },
-                DisplayName: Object.assign(Object.assign({}, localizedText_parser.LocalizedText), { finish() {
-                        this.parent.euInformation.displayName = Object.assign({}, this.localizedText);
-                    } }),
-                Description: Object.assign(Object.assign({}, localizedText_parser.LocalizedText), { finish() {
-                        this.parent.euInformation.description = Object.assign({}, this.localizedText);
-                    } })
+                DisplayName: {
+                    ...localizedText_parser.LocalizedText,
+                    finish() {
+                        this.parent.euInformation.displayName = { ...this.localizedText };
+                    }
+                },
+                Description: {
+                    ...localizedText_parser.LocalizedText,
+                    finish() {
+                        this.parent.euInformation.description = { ...this.localizedText };
+                    }
+                }
             },
             finish() {
                 this.euInformation = new node_opcua_data_access_1.EUInformation(this.euInformation);
@@ -737,14 +741,14 @@ function makeNodeSetParserEngine(addressSpace, options) {
                         debugLog("load nodeset2: typeDefinitionId in ExtensionObject Default XML = " + xmlEncodingNodeId.toString());
                         let captured = self.postTaskData;
                         self.extensionObjectPojo = null;
-                        const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
-                            const extensionObject = yield (0, decode_xml_extension_object_1.decodeXmlExtensionObject)(addressSpace2, xmlEncodingNodeId, captureXmlBody);
+                        const task = async (addressSpace2) => {
+                            const extensionObject = await (0, decode_xml_extension_object_1.decodeXmlExtensionObject)(addressSpace2, xmlEncodingNodeId, captureXmlBody);
                             if (captured) {
                                 captured.postponedExtensionObject = extensionObject;
                             }
                             captureXmlBody = undefined;
                             captured = undefined;
-                        });
+                        };
                         postTasks0_DecodePojoString.push(task);
                         (0, node_opcua_assert_1.assert)(!self.extensionObject || self.extensionObject instanceof node_opcua_extension_object_1.ExtensionObject);
                         break;
@@ -816,18 +820,24 @@ function makeNodeSetParserEngine(addressSpace, options) {
             /* empty */
         },
         parser: {
-            QualifiedName: Object.assign(Object.assign({}, qualifiedName_parser.QualifiedName), { finish() {
+            QualifiedName: {
+                ...qualifiedName_parser.QualifiedName,
+                finish() {
                     this.parent.parent.obj.value = {
                         dataType: node_opcua_variant_1.DataType.QualifiedName,
                         value: this.qualifiedName
                     };
-                } }),
-            LocalizedText: Object.assign(Object.assign({}, localizedText_parser.LocalizedText), { finish() {
+                }
+            },
+            LocalizedText: {
+                ...localizedText_parser.LocalizedText,
+                finish() {
                     this.parent.parent.obj.value = {
                         dataType: node_opcua_variant_1.DataType.LocalizedText,
                         value: this.localizedText
                     };
-                } }),
+                }
+            },
             XmlElement: {
                 finish() {
                     this.parent.parent.obj.value = {
@@ -941,7 +951,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
                             throw new Error("Internal Error : postponedExtensionObject not resolved");
                         }
                         let listExtensionObject = this.listExtensionObject;
-                        const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+                        const task = async (addressSpace2) => {
                             // istanbul ignore next
                             if (!capturedData.postponedExtensionObject) {
                                 throw new Error("Internal Error : postponedExtensionObject not resolved");
@@ -949,7 +959,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
                             listExtensionObject[index] = capturedData.postponedExtensionObject;
                             capturedData = undefined;
                             listExtensionObject = undefined;
-                        });
+                        };
                         postTasks2_AssignedExtensionObjectToDataValue.push(task);
                     }
                 }
@@ -1041,7 +1051,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
         let listExtensionObject = element.listExtensionObject;
         let nodeId = element.parent.parent.obj.nodeId;
         (0, node_opcua_assert_1.assert)(nodeId, "expecting a nodeid");
-        const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+        const task = async (addressSpace2) => {
             const node = addressSpace2.findNode(nodeId);
             if (!node) {
                 debugLog("Cannot find node with nodeId " + nodeId + ". may be the node was marked as deprecated");
@@ -1059,7 +1069,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
             listExtensionObject.slice(0);
             listExtensionObject = undefined;
             nodeId = undefined;
-        });
+        };
         postTasks2_AssignedExtensionObjectToDataValue.push(task);
     }
     function installExtensionObjectInitializationPostTask(element) {
@@ -1068,7 +1078,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
         let data = element.postTaskData;
         let variant = element.parent.parent.obj.value;
         let nodeId = element.parent.parent.obj.nodeId;
-        const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+        const task = async (addressSpace2) => {
             variant.value = data.postponedExtensionObject;
             (0, node_opcua_assert_1.assert)(nodeId, "expecting a nodeid");
             const node = addressSpace2.findNode(nodeId);
@@ -1085,7 +1095,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
             data = undefined;
             variant = undefined;
             nodeId = undefined;
-        });
+        };
         postTasks2_AssignedExtensionObjectToDataValue.push(task);
     }
     const canIngore = ({ isDraft, isDeprecated }, node) => {
@@ -1134,14 +1144,14 @@ function makeNodeSetParserEngine(addressSpace, options) {
             let capturedVariable;
             if (this.obj.value) {
                 let capturedValue = this.obj.value;
-                const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+                const task = async (addressSpace2) => {
                     if (false && doDebug) {
                         debugLog("1 setting value to ", capturedVariable.nodeId.toString(), new node_opcua_variant_1.Variant(capturedValue).toString());
                     }
                     capturedVariable.setValueFromSource(capturedValue);
                     capturedValue = undefined;
                     capturedVariable = undefined;
-                });
+                };
                 if (capturedValue.dataType !== node_opcua_variant_1.DataType.ExtensionObject) {
                     postTasks0_InitializeVariable.push(task);
                 }
@@ -1151,7 +1161,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
                 }
             }
             else {
-                const task = (addressSpace2) => __awaiter(this, void 0, void 0, function* () {
+                const task = async (addressSpace2) => {
                     const dataTypeNode = capturedVariable.dataType;
                     const valueRank = capturedVariable.valueRank;
                     const value = makeDefaultVariant(addressSpace, dataTypeNode, valueRank);
@@ -1167,7 +1177,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
                         }
                     }
                     capturedVariable = undefined;
-                });
+                };
                 postTasks0_InitializeVariable.push(task);
             }
             this.obj.value = undefined;
@@ -1375,10 +1385,9 @@ function makeNodeSetParserEngine(addressSpace, options) {
     };
     const parser = new node_opcua_xml2json_1.Xml2Json(state_0);
     function terminate(callback) {
-        var _a, _b, _c;
         make_back_references(addressSpace1);
         // setting up Server_NamespaceArray
-        if ((_c = (_b = (_a = addressSpace1.rootFolder) === null || _a === void 0 ? void 0 : _a.objects) === null || _b === void 0 ? void 0 : _b.server) === null || _c === void 0 ? void 0 : _c.namespaceArray) {
+        if (addressSpace1.rootFolder?.objects?.server?.namespaceArray) {
             addressSpace1.rootFolder.objects.server.namespaceArray.setValueFromSource({
                 arrayType: node_opcua_variant_1.VariantArrayType.Array,
                 dataType: node_opcua_variant_1.DataType.String,
@@ -1392,56 +1401,52 @@ function makeNodeSetParserEngine(addressSpace, options) {
         doDebug &&
             debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks -------------------------------------------") +
                 chalk_1.default.green("DONE"));
-        function performPostLoadingTasks(tasks) {
-            return __awaiter(this, void 0, void 0, function* () {
-                for (const task of tasks) {
-                    try {
-                        yield task(addressSpace1);
-                    }
-                    catch (err) {
-                        // istanbul ignore next
-                        // tslint:disable:no-console
-                        if (util_1.types.isNativeError(err)) {
-                            errorLog(" performPostLoadingTasks Err  => ", err.message, "\n", err);
-                        }
-                        yield task(addressSpace1);
+        async function performPostLoadingTasks(tasks) {
+            for (const task of tasks) {
+                try {
+                    await task(addressSpace1);
+                }
+                catch (err) {
+                    // istanbul ignore next
+                    // tslint:disable:no-console
+                    if (util_1.types.isNativeError(err)) {
+                        errorLog(" performPostLoadingTasks Err  => ", err.message, "\n", err);
                     }
+                    await task(addressSpace1);
                 }
-                tasks.splice(0);
-            });
+            }
+            tasks.splice(0);
         }
-        function finalSteps() {
-            return __awaiter(this, void 0, void 0, function* () {
-                /// ----------------------------------------------------------------------------------------
-                // perform post task
-                doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks -------------------------------------------"));
-                yield performPostLoadingTasks(postTasks);
-                doDebug &&
-                    debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Simple Variables ---------------------"));
-                yield performPostLoadingTasks(postTasks0_InitializeVariable);
-                doDebug && debugLog(chalk_1.default.bgGreenBright("Performing DataType extraction -------------------------------------------"));
-                (0, node_opcua_assert_1.assert)(!addressSpace1.suspendBackReference);
-                yield (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
-                const dataTypeManager = addressSpace.getDataTypeManager();
-                /// ----------------------------------------------------------------------------------------
-                doDebug && debugLog(chalk_1.default.bgGreenBright("DataType extraction done ") + chalk_1.default.green("DONE"));
-                for (const { name, dataTypeNodeId } of pendingSimpleTypeToRegister) {
-                    if (dataTypeNodeId.namespace === 0) {
-                        continue;
-                    }
-                    const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(dataTypeNodeId.namespace);
+        async function finalSteps() {
+            /// ----------------------------------------------------------------------------------------
+            // perform post task
+            doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks -------------------------------------------"));
+            await performPostLoadingTasks(postTasks);
+            doDebug &&
+                debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Simple Variables ---------------------"));
+            await performPostLoadingTasks(postTasks0_InitializeVariable);
+            doDebug && debugLog(chalk_1.default.bgGreenBright("Performing DataType extraction -------------------------------------------"));
+            (0, node_opcua_assert_1.assert)(!addressSpace1.suspendBackReference);
+            await (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
+            const dataTypeManager = addressSpace.getDataTypeManager();
+            /// ----------------------------------------------------------------------------------------
+            doDebug && debugLog(chalk_1.default.bgGreenBright("DataType extraction done ") + chalk_1.default.green("DONE"));
+            for (const { name, dataTypeNodeId } of pendingSimpleTypeToRegister) {
+                if (dataTypeNodeId.namespace === 0) {
+                    continue;
                 }
-                pendingSimpleTypeToRegister.splice(0);
-                doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Decoding Pojo String (parsing XML objects) -"));
-                yield performPostLoadingTasks(postTasks0_DecodePojoString);
-                doDebug &&
-                    debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Complex Variables ---------------------"));
-                yield performPostLoadingTasks(postTasks1_InitializeVariable);
-                doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks: (assigning Extension Object to Variables) -"));
-                yield performPostLoadingTasks(postTasks2_AssignedExtensionObjectToDataValue);
-                doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post variable initialization ---------------------"));
-                (0, namespace_post_step_1.promoteObjectsAndVariables)(addressSpace);
-            });
+                const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(dataTypeNodeId.namespace);
+            }
+            pendingSimpleTypeToRegister.splice(0);
+            doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Decoding Pojo String (parsing XML objects) -"));
+            await performPostLoadingTasks(postTasks0_DecodePojoString);
+            doDebug &&
+                debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Complex Variables ---------------------"));
+            await performPostLoadingTasks(postTasks1_InitializeVariable);
+            doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks: (assigning Extension Object to Variables) -"));
+            await performPostLoadingTasks(postTasks2_AssignedExtensionObjectToDataValue);
+            doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post variable initialization ---------------------"));
+            (0, namespace_post_step_1.promoteObjectsAndVariables)(addressSpace);
         }
         finalSteps()
             .then(() => callback())
@@ -1470,18 +1475,14 @@ class NodeSetLoader {
         }
         return this._s.addNodeSet(xmlData, callback);
     }
-    addNodeSetAsync(xmlData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, util_1.promisify)(this.addNodeSet).call(this, xmlData);
-        });
+    async addNodeSetAsync(xmlData) {
+        return (0, util_1.promisify)(this.addNodeSet).call(this, xmlData);
     }
     terminate(callback) {
         this._s.terminate(callback);
     }
-    terminateAsync() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, util_1.promisify)(this.terminate).call(this);
-        });
+    async terminateAsync() {
+        return (0, util_1.promisify)(this.terminate).call(this);
     }
 }
 exports.NodeSetLoader = NodeSetLoader;