node-opcua-schemas 2.76.2 → 2.78.0

package/dist/source/parse_binary_xsd.js

@@ -14,11 +14,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseBinaryXSDAsync = exports.parseBinaryXSD = exports.TypeDictionary = void 0;
+exports.parseBinaryXSDAsync = exports.parseBinaryXSD = exports.InternalTypeDictionary = void 0;
 const chalk = require("chalk");
 const node_opcua_assert_1 = require("node-opcua-assert");
 const node_opcua_debug_1 = require("node-opcua-debug");
 const node_opcua_factory_1 = require("node-opcua-factory");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
 const node_opcua_xml2json_1 = require("node-opcua-xml2json");
 const tools_1 = require("./tools");
 const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
@@ -63,37 +64,35 @@ const predefinedType = {
     "ua:Variant": 1,
     "ua:XmlElement": 1
 };
-const found = {};
-function resolveType(typeDictionary, typeName) {
-    const namespace = typeName.split(":")[0];
-    if (predefinedType[typeName]) {
-        return;
-    }
-    if (!found[typeName]) {
-        found[typeName] = typeName;
-    }
-    if (namespace === "ua") {
-        /** */
-    }
-}
-class TypeDictionary {
+class InternalTypeDictionary {
     constructor() {
         this.targetNamespace = "";
+        this.defaultByteOrder = "";
         this.imports = [];
-        this.structuredTypesRaw = [];
-        this.enumeratedTypesRaw = [];
-        this.structuredTypesRawMap = {};
+        this.structuredTypesRaw = {};
+        this.enumeratedTypesRaw = {};
+        // tns: "http://opcfoundation.org/a/b"
+        this._namespaces = {};
         /**  */
     }
-    addRaw(structuredType) {
-        this.structuredTypesRaw.push(structuredType);
-        this.structuredTypesRawMap[structuredType.name] = structuredType;
+    addEnumeration(name, e) {
+        this.enumeratedTypesRaw[name] = e;
+    }
+    getEnumerations() {
+        return Object.values(this.enumeratedTypesRaw);
+    }
+    getStructures() {
+        return Object.values(this.structuredTypesRaw);
+    }
+    addStructureRaw(structuredType) {
+        this.structuredTypesRaw[structuredType.name] = structuredType;
     }
     getStructuredTypesRawByName(name) {
-        return this.structuredTypesRawMap[name];
+        name = name.split(":")[1] || name;
+        return this.structuredTypesRaw[name];
     }
 }
-exports.TypeDictionary = TypeDictionary;
+exports.InternalTypeDictionary = InternalTypeDictionary;
 /* tslint:disable:object-literal-shorthand */
 const state0 = {
     init: () => {
@@ -105,6 +104,13 @@ const state0 = {
                 this.typeDictionary = this.engine.typeDictionary;
                 this.typeDictionary.defaultByteOrder = attributes.DefaultByteOrder;
                 this.typeDictionary.targetNamespace = attributes.TargetNamespace;
+                for (const [k, v] of Object.entries(attributes)) {
+                    if (k.match(/xmlns:/)) {
+                        const ns = k.split(":")[1];
+                        this.typeDictionary._namespaces[ns] = v;
+                        this.typeDictionary._namespaces[v] = ns;
+                    }
+                }
             },
             parser: {
                 Import: {
@@ -155,7 +161,7 @@ const state0 = {
                     },
                     finish: function () {
                         this.typescriptDefinition += `\n}`;
-                        this.parent.typeDictionary.enumeratedTypesRaw[this.attrs.Name] = this.enumeratedType;
+                        this.parent.typeDictionary.addEnumeration(this.attrs.Name, this.enumeratedType);
                         // istanbul ignore next
                         if (doDebug) {
                             debugLog(" this.typescriptDefinition  = ", this.typescriptDefinition);
@@ -169,15 +175,11 @@ const state0 = {
                             debugLog(chalk.cyan("StructureType Name="), chalk.green(this.attrs.Name), " BaseType=", this.attrs.BaseType);
                         }
                         const baseType = this.attrs.BaseType;
-                        const base = this.parent.typeDictionary.structuredTypesRawMap[baseType];
                         const structuredType = {
                             name: this.attrs.Name,
-                            baseType: baseType,
+                            baseType,
                             fields: []
                         };
-                        if (base) {
-                            structuredType.base = base;
-                        }
                         this.structuredType = structuredType;
                     },
                     parser: {
@@ -199,7 +201,6 @@ const state0 = {
                                     // chalk.yellow(" lengthField="), w(this.attrs.LengthField, 40)
                                     );
                                 }
-                                resolveType(this.parent.typeDictionary, this.attrs.TypeName);
                                 const field = {
                                     name: this.attrs.Name,
                                     fieldType: this.attrs.TypeName
@@ -251,7 +252,7 @@ const state0 = {
                     },
                     finish: function () {
                         (0, node_opcua_assert_1.default)(this.attrs.Name === this.structuredType.name);
-                        this.parent.typeDictionary.addRaw(this.structuredType);
+                        this.parent.typeDictionary.addStructureRaw(this.structuredType);
                     }
                 }
             }
@@ -260,20 +261,19 @@ const state0 = {
 };
 function parseBinaryXSD(xmlString, idProvider, dataTypeFactory, callback) {
     const parser = new node_opcua_xml2json_1.Xml2Json(state0);
-    const typeDictionary = new TypeDictionary();
+    const typeDictionary = new InternalTypeDictionary();
     parser.typeDictionary = typeDictionary;
+    if (!xmlString || xmlString.length === 0) {
+        return callback();
+    }
     parser.parseString(xmlString, (err) => {
         // resolve and prepare enumerations
-        for (const key in typeDictionary.enumeratedTypesRaw) {
-            if (!Object.prototype.hasOwnProperty.call(typeDictionary.enumeratedTypesRaw, key)) {
-                continue;
-            }
-            const enumeratedType = typeDictionary.enumeratedTypesRaw[key];
+        for (const enumeratedType of typeDictionary.getEnumerations()) {
             if (Object.keys(enumeratedType.enumeratedValues).length >= 1) {
-                const e = new node_opcua_factory_1.EnumerationDefinitionSchema({
+                const e = new node_opcua_factory_1.EnumerationDefinitionSchema(node_opcua_nodeid_1.NodeId.nullNodeId, {
                     lengthInBits: enumeratedType.lengthInBits || 32,
                     enumValues: enumeratedType.enumeratedValues,
-                    name: key
+                    name: enumeratedType.name
                 });
                 dataTypeFactory.registerEnumeration(e);
             }
@@ -281,41 +281,48 @@ function parseBinaryXSD(xmlString, idProvider, dataTypeFactory, callback) {
         // istanbul ignore next
         if (doDebug) {
             debugLog("------------------------------- Resolving complex Type");
-            typeDictionary.structuredTypesRaw.map((x) => debugLog(x.name));
+            typeDictionary.getStructures().map((x) => debugLog(x.name));
         }
         // create area in navigation order
         function createExplorationOrder() {
             const array = [];
-            const map = {};
+            const _map = {};
+            function alreadyVisited(name) {
+                name = name.split(":")[1] || name;
+                return !!_map[name];
+            }
+            function markAsVisited(name) {
+                name = name.split(":")[1] || name;
+                _map[name] = "1";
+            }
             function visitStructure(structuredType) {
-                if (!structuredType) {
+                if (!structuredType || structuredType.name === "ua:ExtensionObject") {
                     return;
                 }
-                if (map[structuredType.name]) {
+                if (alreadyVisited(structuredType.name)) {
                     return;
                 }
-                if (structuredType.baseType) {
+                markAsVisited(structuredType.name);
+                if (structuredType.baseType && structuredType.baseType !== "ua:ExtensionObject") {
                     const base = typeDictionary.getStructuredTypesRawByName(structuredType.baseType);
-                    if (base) {
+                    if (base && base.baseType) {
+                        doDebug && debugLog("  investigating  base", chalk.cyan(base.name));
                         visitStructure(base);
                     }
                 }
                 for (const f of structuredType.fields) {
-                    const fieldType = f.fieldType.split(":")[1];
-                    const s = typeDictionary.getStructuredTypesRawByName(fieldType);
+                    const s = typeDictionary.getStructuredTypesRawByName(f.fieldType);
                     if (s !== structuredType && s) {
                         visitStructure(s);
                     }
                     else {
-                        map[fieldType] = "1";
+                        markAsVisited(f.fieldType);
                     }
                 }
-                if (!map[structuredType.name]) {
-                    map[structuredType.name] = 1;
-                    array.push(structuredType);
-                }
+                doDebug && debugLog("processing ", chalk.cyan(structuredType.name));
+                array.push(structuredType);
             }
-            for (const structuredType of typeDictionary.structuredTypesRaw) {
+            for (const structuredType of typeDictionary.getStructures()) {
                 visitStructure(structuredType);
             }
             return array;
@@ -323,7 +330,6 @@ function parseBinaryXSD(xmlString, idProvider, dataTypeFactory, callback) {
         // resolve complex types
         const schemaInVisitingOrder = createExplorationOrder();
         for (const structuredType of schemaInVisitingOrder) {
-            debugLog("processing ", chalk.cyan(structuredType.name));
             (0, tools_1.getOrCreateStructuredTypeSchema)(structuredType.name, typeDictionary, dataTypeFactory, idProvider);
         }
         callback(err);

package/dist/source/parse_binary_xsd.js.map

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

package/dist/source/toTypeScript.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toTypeScript = void 0;
 function toTypeScript(dataTypeFactory) {
-    const enumeratedTypes = dataTypeFactory._enumerations;
-    const structuredTypes = dataTypeFactory._structureTypeConstructorByNameMap;
+    const enumeratedTypes = new Map();
+    for (const k of dataTypeFactory.enumerations()) {
+        enumeratedTypes.set(k, dataTypeFactory.getEnumeration(k));
+    }
+    const structuredTypes = new Map();
+    for (const k of dataTypeFactory.structuredTypesNames()) {
+        structuredTypes.set(k, dataTypeFactory.getStructureInfoByTypeName(k));
+    }
     const declaration = new Map();
     function adjustType(t) {
         if (t === "String") {
@@ -33,15 +39,13 @@ function toTypeScript(dataTypeFactory) {
     }
     const alreadyDone = new Set();
     function dumpType(o) {
-        var _a;
         // base type first
-        const b = o.baseType;
-        const bt = (_a = structuredTypes.get(b)) === null || _a === void 0 ? void 0 : _a.schema;
-        if (b && !alreadyDone.has(o.baseType) && bt) {
+        const bt = o.getBaseSchema();
+        if (bt && !alreadyDone.has(o.baseType) && bt) {
             dumpType(bt);
         }
         alreadyDone.add(o.name);
-        const ex1 = b && bt ? `extends ${b} ` : "";
+        const ex1 = bt ? `extends ${bt.name} ` : "";
         if (o.baseType === "Union") {
             const p = [];
             let switchFieldName = "";

package/dist/source/toTypeScript.js.map

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

package/dist/source/tools.d.ts

@@ -1,3 +1,3 @@
 import { DataTypeFactory, IStructuredTypeSchema } from "node-opcua-factory";
-import { MapDataTypeAndEncodingIdProvider, TypeDictionary } from "./parse_binary_xsd";
-export declare function getOrCreateStructuredTypeSchema(name: string, typeDictionary: TypeDictionary, dataTypeFactory: DataTypeFactory, idProvider: MapDataTypeAndEncodingIdProvider): IStructuredTypeSchema;
+import { InternalTypeDictionary, MapDataTypeAndEncodingIdProvider } from "./parse_binary_xsd";
+export declare function getOrCreateStructuredTypeSchema(name: string, typeDictionary: InternalTypeDictionary, dataTypeFactory: DataTypeFactory, idProvider: MapDataTypeAndEncodingIdProvider): IStructuredTypeSchema;

package/dist/source/tools.js

@@ -10,7 +10,7 @@ const dynamic_extension_object_1 = require("./dynamic_extension_object");
 const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
 function _removeNamespacePart(str) {
     if (!str) {
-        return str;
+        return str || "";
     }
     const data = str.split(":");
     return data.length > 1 ? data[1] : str;
@@ -29,9 +29,8 @@ function _adjustFieldTypeName(fieldTypeName) {
     return fieldTypeName;
 }
 function getOrCreateStructuredTypeSchema(name, typeDictionary, dataTypeFactory, idProvider) {
-    // eslint-disable-next-line complexity
     function _getOrCreateStructuredTypeSchema(_name) {
-        if (dataTypeFactory.hasStructuredType(_name)) {
+        if (dataTypeFactory.hasStructureByTypeName(_name)) {
             return dataTypeFactory.getStructuredTypeSchema(_name);
         }
         if (dataTypeFactory.hasEnumeration(_name)) {
@@ -63,87 +62,8 @@ function getOrCreateStructuredTypeSchema(name, typeDictionary, dataTypeFactory,
                 return index < 0;
             });
         }
-        for (const field of structuredType.fields) {
-            const fieldType = field.fieldType;
-            if (!field.schema) {
-                const prefix = _getNamespacePart(fieldType);
-                const fieldTypeName = _adjustFieldTypeName(_removeNamespacePart(fieldType));
-                switch (prefix) {
-                    case "tns":
-                        field.fieldType = fieldTypeName;
-                        if (dataTypeFactory.hasEnumeration(fieldTypeName)) {
-                            const enumeratedType = dataTypeFactory.getEnumeration(fieldTypeName);
-                            field.category = node_opcua_factory_1.FieldCategory.enumeration;
-                            field.schema = enumeratedType;
-                        }
-                        else {
-                            // must be a structure then ....
-                            field.category = node_opcua_factory_1.FieldCategory.complex;
-                            const schema1 = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
-                            field.schema = schema1;
-                            // _getOrCreateStructuredTypeSchema(fieldTypeName);
-                            // istanbul ignore next
-                            if (!field.schema) {
-                                errorLog("cannot find schema for ", fieldTypeName);
-                            }
-                        }
-                        break;
-                    case "ua":
-                        field.fieldType = fieldTypeName;
-                        if ((0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
-                            field.category = node_opcua_factory_1.FieldCategory.basic;
-                            field.schema = (0, node_opcua_factory_1.getBuiltInType)(fieldTypeName);
-                        }
-                        else if (dataTypeFactory.hasStructuredType(fieldTypeName)) {
-                            field.category = node_opcua_factory_1.FieldCategory.complex;
-                            field.schema = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
-                        }
-                        else {
-                            field.category = node_opcua_factory_1.FieldCategory.basic;
-                            // try in this
-                            field.schema = _getOrCreateStructuredTypeSchema(fieldTypeName);
-                            // istanbul ignore next
-                            if (!field.schema) {
-                                errorLog("What should I do ??", fieldTypeName, " ", (0, node_opcua_factory_1.hasStructuredType)(fieldTypeName));
-                            }
-                            else {
-                                if ((0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
-                                    field.category = node_opcua_factory_1.FieldCategory.basic;
-                                }
-                                else {
-                                    field.category = node_opcua_factory_1.FieldCategory.complex;
-                                }
-                            }
-                        }
-                        break;
-                    case "opc":
-                        if ((fieldTypeName === "UAString" || fieldTypeName === "String") && field.name === "IndexRange") {
-                            field.fieldType = "NumericRange";
-                        }
-                        else {
-                            field.fieldType = fieldTypeName;
-                        }
-                        if (!(0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
-                            throw new Error("Unknown basic type " + fieldTypeName);
-                        }
-                        field.category = node_opcua_factory_1.FieldCategory.basic;
-                        break;
-                    default:
-                        if (dataTypeFactory.hasEnumeration(fieldTypeName)) {
-                            field.category = node_opcua_factory_1.FieldCategory.enumeration;
-                            const enumeratedType = dataTypeFactory.getEnumeration(fieldTypeName);
-                            field.schema = enumeratedType;
-                        }
-                        else if (dataTypeFactory.hasStructuredType(fieldTypeName)) {
-                            field.category = node_opcua_factory_1.FieldCategory.complex;
-                            const schema1 = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
-                            field.schema = schema1;
-                        }
-                        break;
-                }
-            }
-        }
-        const schema = (0, node_opcua_factory_1.buildStructuredType)(structuredType);
+        applyOnFields();
+        const schema = new node_opcua_factory_1.StructuredTypeSchema(Object.assign(Object.assign({}, structuredType), { dataTypeFactory }));
         const ids = idProvider.getDataTypeAndEncodingId(schema.name);
         if (!ids) {
             // this may happen if the type is abstract or if the type referes to a internal ExtnsionObject
@@ -152,9 +72,8 @@ function getOrCreateStructuredTypeSchema(name, typeDictionary, dataTypeFactory,
             const Constructor = (0, dynamic_extension_object_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
             return schema;
         }
-        schema.id = ids.dataTypeNodeId;
         schema.dataTypeNodeId = ids.dataTypeNodeId;
-        if (schema.id.namespace === 0 && schema.id.value === 0) {
+        if (schema.dataTypeNodeId.namespace === 0 && schema.dataTypeNodeId.value === 0) {
             return schema;
         }
         schema.encodingDefaultXml = node_opcua_nodeid_1.ExpandedNodeId.fromNodeId(ids.xmlEncodingNodeId);
@@ -163,7 +82,72 @@ function getOrCreateStructuredTypeSchema(name, typeDictionary, dataTypeFactory,
         const Constructor = (0, dynamic_extension_object_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
         Constructor.encodingDefaultBinary = schema.encodingDefaultBinary;
         Constructor.encodingDefaultXml = schema.encodingDefaultXml;
+        Constructor.encodingDefaultJson = schema.encodingDefaultJson;
         return schema;
+        function applyOnFields() {
+            for (const field of structuredType.fields) {
+                const fieldType = field.fieldType;
+                if (!field.schema) {
+                    const prefix = _getNamespacePart(fieldType);
+                    const fieldTypeName = _adjustFieldTypeName(_removeNamespacePart(fieldType));
+                    switch (prefix) {
+                        case "ua":
+                            field.fieldType = fieldTypeName;
+                            if ((0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
+                                field.category = node_opcua_factory_1.FieldCategory.basic;
+                                field.schema = (0, node_opcua_factory_1.getBuiltInType)(fieldTypeName);
+                            }
+                            else if (dataTypeFactory.hasStructureByTypeName(fieldTypeName)) {
+                                field.category = node_opcua_factory_1.FieldCategory.complex;
+                                field.schema = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
+                            }
+                            else {
+                                field.category = node_opcua_factory_1.FieldCategory.basic;
+                                // try in this
+                                field.schema = _getOrCreateStructuredTypeSchema(fieldTypeName);
+                                // istanbul ignore next
+                                if (!field.schema) {
+                                    errorLog("What should I do ??", fieldTypeName, " ", dataTypeFactory.hasStructureByTypeName(fieldTypeName));
+                                }
+                                else {
+                                    if ((0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
+                                        field.category = node_opcua_factory_1.FieldCategory.basic;
+                                    }
+                                    else {
+                                        field.category = node_opcua_factory_1.FieldCategory.complex;
+                                    }
+                                }
+                            }
+                            break;
+                        case "opc":
+                            if ((fieldTypeName === "UAString" || fieldTypeName === "String") && field.name === "IndexRange") {
+                                field.fieldType = "NumericRange";
+                            }
+                            else {
+                                field.fieldType = fieldTypeName;
+                            }
+                            if (!(0, node_opcua_factory_1.hasBuiltInType)(fieldTypeName)) {
+                                throw new Error("Unknown basic type " + fieldTypeName);
+                            }
+                            field.category = node_opcua_factory_1.FieldCategory.basic;
+                            break;
+                        default:
+                            field.fieldType = fieldTypeName;
+                            if (dataTypeFactory.hasEnumeration(fieldTypeName)) {
+                                field.category = node_opcua_factory_1.FieldCategory.enumeration;
+                                const enumeratedType = dataTypeFactory.getEnumeration(fieldTypeName);
+                                field.schema = enumeratedType;
+                            }
+                            else if (dataTypeFactory.hasStructureByTypeName(fieldTypeName)) {
+                                field.category = node_opcua_factory_1.FieldCategory.complex;
+                                const schema1 = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
+                                field.schema = schema1;
+                            }
+                            break;
+                    }
+                }
+            }
+        }
     }
     return _getOrCreateStructuredTypeSchema(name);
 }

package/dist/source/tools.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-schemas",
-    "version": "2.76.2",
+    "version": "2.78.0",
     "description": "pure nodejs OPCUA SDK - module -schemas",
     "main": "dist/source/index.js",
     "types": "dist/source/index.d.ts",
@@ -8,25 +8,25 @@
         "build": "tsc -b",
         "lint": "eslint source test",
         "format": "prettier --write source test",
-        "clean": "npx rimraf dist *.tsbuildinfo",
+        "clean": "npx rimraf node_modules dist *.tsbuildinfo",
         "test": "echo no test"
     },
     "dependencies": {
         "chalk": "4.1.2",
-        "node-opcua-assert": "2.76.0",
-        "node-opcua-binary-stream": "2.76.2",
-        "node-opcua-debug": "2.76.2",
-        "node-opcua-extension-object": "2.76.2",
-        "node-opcua-factory": "2.76.2",
-        "node-opcua-nodeid": "2.76.2",
-        "node-opcua-variant": "2.76.2",
-        "node-opcua-xml2json": "2.76.2"
+        "node-opcua-assert": "2.77.0",
+        "node-opcua-binary-stream": "2.77.0",
+        "node-opcua-debug": "2.77.0",
+        "node-opcua-extension-object": "2.78.0",
+        "node-opcua-factory": "2.78.0",
+        "node-opcua-nodeid": "2.77.0",
+        "node-opcua-variant": "2.78.0",
+        "node-opcua-xml2json": "2.77.0"
     },
     "devDependencies": {
         "mocha": "^10.0.0",
-        "node-opcua-data-model": "2.76.2",
-        "node-opcua-packet-analyzer": "2.76.2",
-        "node-opcua-utils": "2.76.0",
+        "node-opcua-data-model": "2.78.0",
+        "node-opcua-packet-analyzer": "2.78.0",
+        "node-opcua-utils": "2.77.0",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -44,5 +44,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "acb5ecaf1e1c71af3b63e80909d58447f3f298e7"
+    "gitHead": "31c6eee3c51f52427584364fff2fdb07bbac65be"
 }