node-opcua-convert-nodeset-to-javascript 2.63.1 → 2.64.1

package/dist/utils.js

@@ -0,0 +1,221 @@
+"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.getChildrenOrFolderElements = exports.convertNodeIdToDataTypeAsync = exports.getTypeDefinition = exports.getTypeDefOrBaseType = exports.getSubtypeNodeId = exports.getSubtypeNodeIdIfAny = exports.getModellingRule = exports.getFolderElements = exports.getChildren = exports.getNodeClass = exports.getDescription = exports.getIsAbstract = exports.getBrowseName = exports.getDefinition = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_types_1 = require("node-opcua-types");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+function getDefinition(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition });
+        return dataValue.value.value || null;
+    });
+}
+exports.getDefinition = getDefinition;
+function getBrowseName(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName });
+        return dataValue.value.value;
+    });
+}
+exports.getBrowseName = getBrowseName;
+function getIsAbstract(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract });
+        return dataValue.value.value;
+    });
+}
+exports.getIsAbstract = getIsAbstract;
+function getDescription(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.Description });
+        return dataValue.value.value;
+    });
+}
+exports.getDescription = getDescription;
+function getNodeClass(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataValue = yield session.read({ nodeId, attributeId: node_opcua_data_model_1.AttributeIds.NodeClass });
+        return dataValue.value.value;
+    });
+}
+exports.getNodeClass = getNodeClass;
+function getChildren(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            includeSubtypes: true,
+            nodeClassMask: node_opcua_data_model_1.NodeClassMask.Method | node_opcua_data_model_1.NodeClassMask.Object | node_opcua_data_model_1.NodeClass.Variable,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasChild"),
+            resultMask: 0xffff
+        });
+        return browseResult.references || [];
+    });
+}
+exports.getChildren = getChildren;
+function getFolderElements(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            includeSubtypes: true,
+            nodeClassMask: node_opcua_data_model_1.NodeClassMask.Method | node_opcua_data_model_1.NodeClassMask.Object | node_opcua_data_model_1.NodeClass.Variable,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("Organizes"),
+            resultMask: 0xffff
+        });
+        return browseResult.references || [];
+    });
+}
+exports.getFolderElements = getFolderElements;
+function getModellingRule(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            includeSubtypes: true,
+            nodeClassMask: node_opcua_data_model_1.NodeClassMask.Method | node_opcua_data_model_1.NodeClassMask.Object | node_opcua_data_model_1.NodeClass.Variable,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasModellingRule"),
+            resultMask: 0xffff
+        });
+        if (!browseResult.references || browseResult.references.length === 0) {
+            return null;
+            console.log(nodeId.toString());
+            const browseName = yield getBrowseName(session, nodeId);
+            throw new Error("No modelling rule for " + nodeId.toString() + " " + browseName.toString());
+        }
+        return browseResult.references[0].browseName.name;
+    });
+}
+exports.getModellingRule = getModellingRule;
+function getSubtypeNodeIdIfAny(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (nodeId.isEmpty()) {
+            return null;
+        }
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
+            includeSubtypes: true,
+            nodeClassMask: 0,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasSubtype"),
+            resultMask: 0xffff
+        });
+        if (!browseResult.references || browseResult.references.length === 0) {
+            return null;
+        }
+        return browseResult.references[0];
+    });
+}
+exports.getSubtypeNodeIdIfAny = getSubtypeNodeIdIfAny;
+function getSubtypeNodeId(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const r = yield getSubtypeNodeIdIfAny(session, nodeId);
+        if (!r) {
+            throw new Error("No Subtype");
+        }
+        return r;
+    });
+}
+exports.getSubtypeNodeId = getSubtypeNodeId;
+function getTypeDefOrBaseType(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            includeSubtypes: true,
+            nodeClassMask: 0,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasTypeDefinition"),
+            resultMask: 0xffff
+        });
+        if (!browseResult.references || browseResult.references.length === 0) {
+            browseResult = yield session.browse({
+                browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
+                includeSubtypes: true,
+                nodeClassMask: 0,
+                nodeId,
+                referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasSubtype"),
+                resultMask: 0xffff
+            });
+        }
+        if (!browseResult.references || browseResult.references.length === 0) {
+            return new node_opcua_types_1.ReferenceDescription({});
+        }
+        return browseResult.references[0];
+    });
+}
+exports.getTypeDefOrBaseType = getTypeDefOrBaseType;
+function getTypeDefinition(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            includeSubtypes: true,
+            nodeClassMask: 0,
+            nodeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasTypeDefinition"),
+            resultMask: 0xffff
+        });
+        if (!browseResult.references || browseResult.references.length === 0) {
+            console.log(nodeId.toString());
+            throw new Error("No subtype");
+        }
+        return browseResult.references[0];
+    });
+}
+exports.getTypeDefinition = getTypeDefinition;
+// see also client-proxy
+function convertNodeIdToDataTypeAsync(session, dataTypeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const nodeToRead = {
+            attributeId: node_opcua_data_model_1.AttributeIds.BrowseName,
+            nodeId: dataTypeId
+        };
+        const dataValue = yield session.read(nodeToRead);
+        let dataType;
+        // istanbul ignore next
+        if (dataValue.statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
+            return (dataType = node_opcua_variant_1.DataType.Null);
+        }
+        const dataTypeName = dataValue.value.value;
+        if (dataTypeId.namespace === 0 && node_opcua_variant_1.DataType[dataTypeId.value]) {
+            dataType = dataTypeId.value;
+            return dataType;
+        }
+        /// example => Duration (i=290) => Double (i=11)
+        // read subTypeOf
+        const nodeToBrowse = {
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
+            nodeId: dataTypeId,
+            referenceTypeId: node_opcua_nodeid_1.resolveNodeId("HasSubtype"),
+            resultMask: 0xff
+        };
+        // tslint:disable:no-shadowed-variable
+        const browseResult = yield session.browse(nodeToBrowse);
+        const references = browseResult.references;
+        if (!references || references.length !== 1) {
+            throw new Error("cannot find SuperType of " + dataTypeName.toString());
+        }
+        const nodeId = references[0].nodeId;
+        return convertNodeIdToDataTypeAsync(session, nodeId);
+    });
+}
+exports.convertNodeIdToDataTypeAsync = convertNodeIdToDataTypeAsync;
+function getChildrenOrFolderElements(session, nodeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const c1 = yield getChildren(session, nodeId);
+        const c2 = yield getFolderElements(session, nodeId);
+        return [].concat(c1, c2);
+    });
+}
+exports.getChildrenOrFolderElements = getChildrenOrFolderElements;
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

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

package/dist/walk_through.d.ts

@@ -1,13 +1,13 @@
-import { IBasicSession } from "node-opcua-pseudo-session";
-import { ReferenceDescription } from "node-opcua-types";
-export interface ReferenceDescriptionEx extends ReferenceDescription {
-    parent: ReferenceDescriptionEx;
-}
-export interface NodeVisitor {
-    visit(reference: ReferenceDescriptionEx, level: number): Promise<void>;
-}
-export declare function walkThroughReferenceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughDataTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughInterfaceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughObjectTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
-export declare function walkThroughVariableTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+import { IBasicSession } from "node-opcua-pseudo-session";
+import { ReferenceDescription } from "node-opcua-types";
+export interface ReferenceDescriptionEx extends ReferenceDescription {
+    parent: ReferenceDescriptionEx;
+}
+export interface NodeVisitor {
+    visit(reference: ReferenceDescriptionEx, level: number): Promise<void>;
+}
+export declare function walkThroughReferenceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughDataTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughInterfaceTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughObjectTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;
+export declare function walkThroughVariableTypes(session: IBasicSession, nodeVisitor?: NodeVisitor): Promise<void>;

package/dist/walk_through.js

@@ -1,87 +1,87 @@
-"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.walkThroughVariableTypes = exports.walkThroughObjectTypes = exports.walkThroughInterfaceTypes = exports.walkThroughDataTypes = exports.walkThroughReferenceTypes = void 0;
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_types_1 = require("node-opcua-types");
-function _walkThroughTypes(session, nodeId, visitor, level, parent) {
-    return __awaiter(this, void 0, void 0, function* () {
-        level = level || 0;
-        if (!parent) {
-            const dataValues = yield session.read([
-                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName },
-                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.NodeClass }
-            ]);
-            const browseName = dataValues[0].value.value;
-            const nodeClass = dataValues[1].value.value;
-            parent = new node_opcua_types_1.ReferenceDescription({
-                isForward: true,
-                nodeId: nodeId,
-                browseName,
-                nodeClass,
-                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype")
-                // typeDefinition,
-            });
-        }
-        const browseResult = yield session.browse({
-            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
-            nodeId,
-            includeSubtypes: true,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype"),
-            resultMask: 0xff
-        });
-        for (const reference of browseResult.references || []) {
-            if (visitor) {
-                const r = reference;
-                r.parent = parent;
-                yield visitor.visit(r, level);
-            }
-            yield _walkThroughTypes(session, reference.nodeId, visitor, level + 1, reference);
-        }
-    });
-}
-function walkThroughReferenceTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseReferenceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("References");
-        yield _walkThroughTypes(session, baseReferenceTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughReferenceTypes = walkThroughReferenceTypes;
-function walkThroughDataTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseDataTypeTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseDataType");
-        yield _walkThroughTypes(session, baseDataTypeTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughDataTypes = walkThroughDataTypes;
-function walkThroughInterfaceTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseInterfaceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseInterfaceType");
-        yield _walkThroughTypes(session, baseInterfaceTypeNodeId, nodeVisitor);
-    });
-}
-exports.walkThroughInterfaceTypes = walkThroughInterfaceTypes;
-function walkThroughObjectTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseObjectType");
-        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
-    });
-}
-exports.walkThroughObjectTypes = walkThroughObjectTypes;
-function walkThroughVariableTypes(session, nodeVisitor) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseVariableType");
-        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
-    });
-}
-exports.walkThroughVariableTypes = walkThroughVariableTypes;
+"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.walkThroughVariableTypes = exports.walkThroughObjectTypes = exports.walkThroughInterfaceTypes = exports.walkThroughDataTypes = exports.walkThroughReferenceTypes = void 0;
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_nodeid_1 = require("node-opcua-nodeid");
+const node_opcua_types_1 = require("node-opcua-types");
+function _walkThroughTypes(session, nodeId, visitor, level, parent) {
+    return __awaiter(this, void 0, void 0, function* () {
+        level = level || 0;
+        if (!parent) {
+            const dataValues = yield session.read([
+                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName },
+                { nodeId, attributeId: node_opcua_data_model_1.AttributeIds.NodeClass }
+            ]);
+            const browseName = dataValues[0].value.value;
+            const nodeClass = dataValues[1].value.value;
+            parent = new node_opcua_types_1.ReferenceDescription({
+                isForward: true,
+                nodeId: nodeId,
+                browseName,
+                nodeClass,
+                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype")
+                // typeDefinition,
+            });
+        }
+        const browseResult = yield session.browse({
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
+            nodeId,
+            includeSubtypes: true,
+            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasSubtype"),
+            resultMask: 0xff
+        });
+        for (const reference of browseResult.references || []) {
+            if (visitor) {
+                const r = reference;
+                r.parent = parent;
+                yield visitor.visit(r, level);
+            }
+            yield _walkThroughTypes(session, reference.nodeId, visitor, level + 1, reference);
+        }
+    });
+}
+function walkThroughReferenceTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseReferenceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("References");
+        yield _walkThroughTypes(session, baseReferenceTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughReferenceTypes = walkThroughReferenceTypes;
+function walkThroughDataTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseDataTypeTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseDataType");
+        yield _walkThroughTypes(session, baseDataTypeTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughDataTypes = walkThroughDataTypes;
+function walkThroughInterfaceTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseInterfaceTypeNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("BaseInterfaceType");
+        yield _walkThroughTypes(session, baseInterfaceTypeNodeId, nodeVisitor);
+    });
+}
+exports.walkThroughInterfaceTypes = walkThroughInterfaceTypes;
+function walkThroughObjectTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseObjectType");
+        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
+    });
+}
+exports.walkThroughObjectTypes = walkThroughObjectTypes;
+function walkThroughVariableTypes(session, nodeVisitor) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseObjectType = (0, node_opcua_nodeid_1.resolveNodeId)("BaseVariableType");
+        yield _walkThroughTypes(session, baseObjectType, nodeVisitor);
+    });
+}
+exports.walkThroughVariableTypes = walkThroughVariableTypes;
 //# sourceMappingURL=walk_through.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-convert-nodeset-to-javascript",
-    "version": "2.63.1",
+    "version": "2.64.1",
     "description": "pure nodejs OPCUA SDK - module -convert-nodeset-to-javascript",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -14,29 +14,29 @@
     "dependencies": {
         "@types/wordwrap": "^1.0.1",
         "case-anything": "1.1.3",
-        "node-opcua-address-space": "2.63.1",
-        "node-opcua-address-space-base": "2.63.1",
-        "node-opcua-assert": "2.63.0",
-        "node-opcua-basic-types": "2.63.1",
-        "node-opcua-constants": "2.62.7",
-        "node-opcua-data-access": "2.63.1",
-        "node-opcua-data-model": "2.63.1",
-        "node-opcua-data-value": "2.63.1",
-        "node-opcua-debug": "2.63.1",
-        "node-opcua-factory": "2.63.1",
-        "node-opcua-nodeid": "2.63.1",
-        "node-opcua-pseudo-session": "2.63.1",
-        "node-opcua-service-translate-browse-path": "2.63.1",
-        "node-opcua-status-code": "2.63.1",
-        "node-opcua-types": "2.63.1",
-        "node-opcua-utils": "2.63.1",
+        "node-opcua-address-space": "2.64.1",
+        "node-opcua-address-space-base": "2.64.1",
+        "node-opcua-assert": "2.64.1",
+        "node-opcua-basic-types": "2.64.1",
+        "node-opcua-constants": "2.64.1",
+        "node-opcua-data-access": "2.64.1",
+        "node-opcua-data-model": "2.64.1",
+        "node-opcua-data-value": "2.64.1",
+        "node-opcua-debug": "2.64.1",
+        "node-opcua-factory": "2.64.1",
+        "node-opcua-nodeid": "2.64.1",
+        "node-opcua-pseudo-session": "2.64.1",
+        "node-opcua-service-translate-browse-path": "2.64.1",
+        "node-opcua-status-code": "2.64.1",
+        "node-opcua-types": "2.64.1",
+        "node-opcua-utils": "2.64.1",
         "wordwrap": "^1.0.0"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.63.1",
-        "node-opcua-nodesets": "2.63.0",
-        "node-opcua-packet-analyzer": "2.63.1",
-        "node-opcua-variant": "2.63.1",
+        "node-opcua-leak-detector": "2.64.1",
+        "node-opcua-nodesets": "2.64.1",
+        "node-opcua-packet-analyzer": "2.64.1",
+        "node-opcua-variant": "2.64.1",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -54,5 +54,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "d37385314fce703c1cc197104c592df03b2663fb"
+    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
 }

package/source/convert_namespace_to_typescript.ts

@@ -8,11 +8,22 @@ import { convertTypeToTypescript } from "./convert_to_typescript";
 import { constructCache } from "./private/cache";
 import { Options } from "./options";
 
-function getPackageInfo(dependency: string) {
-    const d = path.join(__dirname, "../../" + dependency + "/package.json");
-    const p = JSON.parse(fs.readFileSync(d, "utf8"));
-    return p;
+function getPackageInfo(dependency: string, options: Options) {
+    console.log("getPackageInfo", dependency);
+
+    const l = [...(options.lookupFolders || [])];
+    l.push(path.join(__dirname, "../../"));
+    for (const folder of l) {
+        const d = path.join(folder, dependency + "/package.json");
+        if (!fs.existsSync(d)) {
+            continue;
+        }
+        const p = JSON.parse(fs.readFileSync(d, "utf8"));
+        return p;
+    }
+    throw new Error("cannot find package.json for " + dependency);
 }
+
 interface Info {
     files: string[];
     folder: string;
@@ -79,7 +90,7 @@ export async function convertNamespaceTypeToTypescript(
     await walkThroughVariableTypes(session, nodeVisitor);
     await walkThroughDataTypes(session, nodeVisitor);
 
-    await outputFiles(infos);
+    await outputFiles(infos, options);
 }
 
 async function _output_index_ts_file(info: Info): Promise<void> {
@@ -97,9 +108,9 @@ async function _output_index_ts_file(info: Info): Promise<void> {
     fs.writeFileSync(index, content.join("\n"));
     // create package.json
 }
-async function _output_package_json(info: Info): Promise<void> {
+async function _output_package_json(info: Info, options: Options): Promise<void> {
     const packagejson = path.join(info.folder, "package.json");
-    const version = getPackageInfo("node-opcua-address-space-base").version;
+    const version = getPackageInfo("node-opcua-address-space-base", options).version;
 
     const content2: string[] = [];
     content2.push(`{`);
@@ -118,7 +129,7 @@ async function _output_package_json(info: Info): Promise<void> {
     // find versions
     const versions: { [key: string]: string } = {};
     for (const dependency of info.dependencies) {
-        const p = await getPackageInfo(dependency);
+        const p = await getPackageInfo(dependency, options);
         versions[dependency] = p.version;
     }
     content2.push(
@@ -165,12 +176,12 @@ async function _output_tsconfig_json(info: Info): Promise<void> {
 
     fs.writeFileSync(tsconfig, content3.join("\n"));
 }
-async function outputFiles(infos: { [key: string]: Info }) {
+async function outputFiles(infos: { [key: string]: Info }, options: Options) {
     for (const info of Object.values(infos) as Info[]) {
         // create indexes
         await _output_index_ts_file(info);
 
-        await _output_package_json(info);
+        await _output_package_json(info, options);
 
         await _output_tsconfig_json(info);
     }

package/source/convert_to_typescript.ts

@@ -52,19 +52,25 @@ export async function convertDataTypeToTypescript(session: IBasicSession, dataTy
 }
 
 // to avoid clashes
-function toJavascritPropertyName(childName: string): string {
+function toJavascritPropertyName(childName: string, { ignoreConflictingName }: { ignoreConflictingName: boolean }): string {
     childName = lowerFirstLetter(childName);
-    if (childName === "namespaceUri") {
-        childName = "$namespaceUri";
-    }
-    if (childName === "rolePermissions") {
-        childName = "$rolePermissions";
-    }
-    if (childName === "displayName") {
-        childName = "$displayName";
-    }
-    if (childName === "eventNotifier") {
-        childName = "$eventNotifier";
+
+    if (ignoreConflictingName) {
+        if (childName === "namespaceUri") {
+            childName = "$namespaceUri";
+        }
+        if (childName === "rolePermissions") {
+            childName = "$rolePermissions";
+        }
+        if (childName === "displayName") {
+            childName = "$displayName";
+        }
+        if (childName === "eventNotifier") {
+            childName = "$eventNotifier";
+        }
+        if (childName === "description") {
+            childName = "$description";
+        }
     }
     return childName.replace(/</g, "$").replace(/>/g, "$").replace(/ |\./g, "_").replace(/#/g, "_");
 }
@@ -432,7 +438,7 @@ async function _extractLocalMembers(session: IBasicSession, classMember: ClassMe
     for (const child of classMember.children) {
         const nodeId = child.nodeId;
         const browseName = await getBrowseName(session, nodeId);
-        const name = toJavascritPropertyName(browseName.name!);
+        const name = toJavascritPropertyName(browseName.name!, { ignoreConflictingName: true });
 
         const description = await getDescription(session, nodeId);
         const modellingRule = await getModellingRule(session, nodeId);
@@ -545,7 +551,7 @@ export async function extractClassMemberDef(
 ): Promise<ClassMember> {
     const nodeClass = await getNodeClass(session, nodeId);
     const browseName = await getBrowseName(session, nodeId);
-    const name = toJavascritPropertyName(browseName.name!);
+    const name = toJavascritPropertyName(browseName.name!, { ignoreConflictingName: true });
 
     if (nodeClass !== NodeClass.Method && nodeClass !== NodeClass.Object && nodeClass !== NodeClass.Variable) {
         throw new Error("Invalid property " + NodeClass[nodeClass] + " " + browseName?.toString() + " " + nodeId.toString());
@@ -559,7 +565,7 @@ export async function extractClassMemberDef(
 
     const typeDefinition = await getTypeDefOrBaseType(session, nodeId);
 
-    if (nodeClass!== NodeClass.Method && (!typeDefinition.browseName || !typeDefinition.browseName.name)) {
+    if (nodeClass !== NodeClass.Method && (!typeDefinition.browseName || !typeDefinition.browseName.name)) {
         warningLog(typeDefinition.toString());
         warningLog("cannot find typeDefinition for ", browseName.toString(), "( is the namespace loaded ?)");
     }
@@ -691,7 +697,7 @@ function dumpChildren(session: IBasicSession, padding: string, children: ClassMe
 
         if (modellingRule === "MandatoryPlaceholder" || modellingRule === "OptionalPlaceholder") continue;
         cache.ensureImported(childType);
-        const adjustedName = toJavascritPropertyName(name);
+        const adjustedName = toJavascritPropertyName(name, { ignoreConflictingName: true });
         if (description.text) {
             f.write(`${padding}/**`);
             f.write(`${padding} * ${name || ""}`);
@@ -846,7 +852,7 @@ export async function _exportDataTypeToTypescript(
             f.write(`export interface ${interfaceName} extends ${baseInterfaceName}  {`);
         }
         for (const field of definition.fields!) {
-            const fieldName = toJavascritPropertyName(field.name!);
+            const fieldName = toJavascritPropertyName(field.name!, { ignoreConflictingName: false });
             // special case ! fieldName=
             if (field.description.text) {
                 f.write(`/** ${field.description.text}*/`);