node-opcua-modeler 2.62.7 → 2.64.0

package/dist/to_graphivz.js

@@ -0,0 +1,295 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dumpTypeDiagram = exports.graphVizToPlantUml = exports.dumpClassHierachry = exports.opcuaToDot = void 0;
+const node_opcua_address_space_1 = require("node-opcua-address-space");
+const node_opcua_constants_1 = require("node-opcua-constants");
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+function e(str) {
+    return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function innerText(node) {
+    var _a, _b;
+    const browseName = node.browseName.name;
+    const typeDefinition = (_b = (_a = node.typeDefinitionObj) === null || _a === void 0 ? void 0 : _a.browseName) === null || _b === void 0 ? void 0 : _b.name;
+    if (typeDefinition) {
+        return `[ label =< <FONT point-size="8" ><I>${typeDefinition}</I></FONT><BR/>${e(browseName)} >]`;
+    }
+    else {
+        return `[label =< ${e(browseName)} >]`;
+    }
+}
+function arrowHeadAttribute(reference) {
+    switch (reference.referenceType.value) {
+        case node_opcua_constants_1.ReferenceTypeIds.HasTypeDefinition:
+            return "normalnormal";
+        case node_opcua_constants_1.ReferenceTypeIds.HasComponent:
+            return "noneteetee";
+        case node_opcua_constants_1.ReferenceTypeIds.HasProperty:
+            return "nonetee";
+        case node_opcua_constants_1.ReferenceTypeIds.HasSubtype:
+            return "onormalonormal";
+        case node_opcua_constants_1.ReferenceTypeIds.HasModellingRule:
+            return "none";
+        default:
+            return "normal";
+    }
+}
+function arrowHead(reference) {
+    return `[arrowhead = ${arrowHeadAttribute(reference)}]`;
+}
+const regularShapes = {
+    ObjectType: '[shape=rectangle, style="filled" fillcolor="#e8edf7;0.75:#d2def0" gradientangle=275]',
+    VariableType: '[shape=rectangle, style="rounded,filled" fillcolor="#e8edf7;0.75:#d2def0" gradientangle=275]',
+    Object: ' [shape=rectangle, style="filled" fillcolor="#e8edf7"]',
+    Variable: '[shape=rectangle, style="filled,rounded" fillcolor="#e8edf7"]',
+    Method: '[shape=oval, style="filled" fillcolor="#e8edf7"]'
+};
+const regularShapesOptionals = {
+    ObjectType: '[shape=rectangle, style="filled,dashed" fillcolor="#e8edf7;0.75:#d2def0" gradientangle=275]',
+    VariableType: '[shape=rectangle, style="rounded,filled,dashed" fillcolor="#e8edf7;0.75:#d2def0" gradientangle=275]',
+    Object: ' [shape=rectangle, style="filled,dashed" fillcolor="#e8edf7"]',
+    Variable: '[shape=rectangle, style="filled,rounded,dashed" fillcolor="#e8edf7"]',
+    Method: '[shape=oval, style="filled,dashed" fillcolor="#e8edf7"]'
+};
+class NodeRegistry {
+    constructor() {
+        this.m = {};
+        this.invisibleNodes = [];
+        this.duplicated = {};
+    }
+    add(name, node) {
+        if (this.duplicated[name]) {
+            return; //throw new Error("Already included");
+        }
+        this.duplicated[name] = name;
+        const nodeClass = node_opcua_data_model_1.NodeClass[node.nodeClass];
+        this.m[nodeClass] = this.m[nodeClass] || [];
+        this.m[nodeClass].push({ name, node });
+    }
+    addInvisibleNode(name) {
+        this.invisibleNodes.push(name);
+    }
+}
+function dumpNodeByNodeClass(str, nodeRegistry) {
+    for (const [className, listNode] of Object.entries(nodeRegistry.m)) {
+        if (listNode.length === 0) {
+            continue;
+        }
+        str.push(`  ## -> ${className}`);
+        const mandatoryNodes = listNode.filter(({ name, node }) => !node.modellingRule || node.modellingRule.match(/Mandatory/));
+        const optionalNodes = listNode.filter(({ name, node }) => node.modellingRule && node.modellingRule.match(/Optional/));
+        if (mandatoryNodes.length > 0) {
+            str.push(`  node [];`);
+            const decoration = regularShapes[className];
+            str.push(`  node ${decoration};`);
+            for (const { name, node } of mandatoryNodes) {
+                str.push(`  ${name} ${innerText(node)}`);
+            }
+        }
+        if (optionalNodes.length > 0) {
+            const decoration2 = regularShapesOptionals[className];
+            str.push(`  node [];`);
+            str.push(`  node ${decoration2};`);
+            for (const { name, node } of listNode) {
+                str.push(`  ${name} ${innerText(node)}`);
+            }
+        }
+    }
+    if (nodeRegistry.invisibleNodes.length) {
+        str.push("  #  invisible nodes");
+        str.push("  node []");
+        str.push("  node [width=0,height=0,shape=point,style=invis];");
+        str.push(`  ${nodeRegistry.invisibleNodes.join("\n  ")};`);
+    }
+}
+const dump_state_machine_to_graphviz_1 = require("./dump_state_machine_to_graphviz");
+function opcuaToDot(node, options) {
+    if (node.nodeClass === node_opcua_data_model_1.NodeClass.ObjectType) {
+        const finitieStateMachineType = node.addressSpace.findObjectType("FiniteStateMachineType");
+        if (finitieStateMachineType) {
+            if (node.isSupertypeOf(finitieStateMachineType)) {
+                const stateMachine = node.instantiate({ browseName: "StateMachine" });
+                (0, node_opcua_address_space_1.promoteToStateMachine)(stateMachine);
+                return (0, dump_state_machine_to_graphviz_1.dumpStateMachineToPlantUML)(stateMachine);
+            }
+        }
+    }
+    options = options || { naked: false };
+    const nodeRegistry = new NodeRegistry();
+    const str = [];
+    const str2 = [];
+    str.push("digraph G {");
+    if (!options.naked) {
+        str.push("  rankdir=TB;");
+        str.push("  nodesep=0.5;");
+        str.push("  node [];");
+    }
+    function makeId(p, c) {
+        return `${p}_${c}`.replace(" ", "_").replace(/<|>/g, "_");
+    }
+    // eslint-disable-next-line max-params
+    // eslint-disable-next-line max-statements
+    function typeMemberAndSubTypeMember(str, parentNode, node, parent, offset, prefix, joinWithCaller, visitorMap) {
+        let innerDepth = 0;
+        const browseName = (parent || node).browseName.name.toString();
+        const r = [];
+        const r2 = [];
+        const references = (parent || node).findReferencesEx("Aggregates", node_opcua_data_model_1.BrowseDirection.Forward);
+        const folderElements = (parent || node).findReferencesEx("Organizes", node_opcua_data_model_1.BrowseDirection.Forward);
+        const childReferences = [...references, ...folderElements];
+        const id = makeId(parentNode, browseName);
+        nodeRegistry.add(id, node);
+        function addInvisibleNode(prefix, index) {
+            const breakNode = `${prefix}${index}`;
+            r2.push(breakNode);
+            nodeRegistry.addInvisibleNode(breakNode);
+            return breakNode;
+        }
+        for (let i = 0; i < childReferences.length; i++) {
+            const isLast = i === childReferences.length - 1;
+            const reference = childReferences[i];
+            const childNode = reference.node;
+            const childName = childNode.browseName.name.toString();
+            const fullChildName = makeId(id, childName);
+            // avoid member duplication
+            if (visitorMap[fullChildName]) {
+                continue;
+            }
+            else {
+                visitorMap[fullChildName] = 1;
+            }
+            innerDepth++;
+            nodeRegistry.add(fullChildName, childNode);
+            const edgeAttributes = arrowHead(reference);
+            const breakNode = addInvisibleNode(prefix, i + offset);
+            const horizontalPart = `{ rank=same ${breakNode} -> ${fullChildName} ${edgeAttributes} }`;
+            r.push(horizontalPart);
+            // push children  on same level
+            const [depth] = typeMemberAndSubTypeMember(str, id, childNode, null, 0, `${prefix}${i + offset}_`, false, visitorMap);
+            // add invisible nodes
+            {
+                for (let d = 0; d < depth; d++) {
+                    offset++;
+                    if (!isLast) {
+                        addInvisibleNode(prefix, i + offset);
+                    }
+                }
+                innerDepth += depth;
+            }
+        }
+        if (node.nodeClass == node_opcua_data_model_1.NodeClass.ObjectType || node.nodeClass === node_opcua_data_model_1.NodeClass.VariableType) {
+            if (node.subtypeOfObj && node.subtypeOfObj.nodeId.namespace === node.nodeId.namespace) {
+                const [depth, rr2] = typeMemberAndSubTypeMember(str, parentNode, node.subtypeOfObj, node, r.length + offset + 1, prefix, true, visitorMap);
+                innerDepth += depth + 1;
+                r2.push(...rr2);
+            }
+        }
+        if (r.length) {
+            str.push(...r.map((x) => "  " + x));
+        }
+        if (!joinWithCaller) {
+            if (r2.length) {
+                str.push(`  ${id} -> ${r2.join(" -> ")} [arrowhead=none];`);
+            }
+        }
+        return [innerDepth, r2];
+    }
+    const visitorMap = {};
+    typeMemberAndSubTypeMember(str2, "", node, null, 0, "r", false, visitorMap);
+    if (!options.naked) {
+        dumpNodeByNodeClass(str, nodeRegistry);
+    }
+    str.push(...str2);
+    str.push("}");
+    //
+    const dot = str.join("\n");
+    return dot;
+}
+exports.opcuaToDot = opcuaToDot;
+function dumpClassHierachry(typeNode, options) {
+    options = options || { naked: false, showBaseType: true, showSubType: true };
+    const level = options.depth || 50;
+    const str = [];
+    const nodeRegistry = new NodeRegistry();
+    nodeRegistry.add(typeNode.browseName.name, typeNode);
+    str.push("digraph G {");
+    if (!options.naked) {
+        // str.push("  splines=ortho;");
+        str.push("  rankdir=BT;");
+        str.push("  nodesep=0.5;");
+        str.push("  node [];");
+    }
+    function dumpSubtypes(str, typeNode, level) {
+        const parentName = typeNode.browseName.name.toString();
+        const references = typeNode.findReferencesEx("HasSubtype", node_opcua_data_model_1.BrowseDirection.Forward);
+        for (let i = 0; i < references.length; i++) {
+            const reference = references[i];
+            const childNode = reference.node;
+            const nodeClass = node_opcua_data_model_1.NodeClass[childNode.nodeClass];
+            const childName = childNode.browseName.name.toString();
+            nodeRegistry.add(childName, childNode);
+            const edgeAttributes = arrowHead(reference);
+            str.push(`  ${childName}  -> ${parentName} ${edgeAttributes};`);
+            if (level > 0) {
+                dumpSubtypes(str, childNode, level - 1);
+            }
+        }
+    }
+    function dumpBaseTypes(str, typeNode, level) {
+        const parentName = typeNode.browseName.name.toString();
+        const references = typeNode.findReferencesEx("HasSubtype", node_opcua_data_model_1.BrowseDirection.Inverse);
+        for (let i = 0; i < references.length; i++) {
+            const reference = references[i];
+            const childNode = reference.node;
+            const nodeClass = node_opcua_data_model_1.NodeClass[childNode.nodeClass];
+            const childName = childNode.browseName.name.toString();
+            nodeRegistry.add(childName, childNode);
+            const edgeAttributes = arrowHead(reference);
+            str.push(`  ${parentName}  -> ${childName} ${edgeAttributes};`);
+            if (level > 0) {
+                dumpBaseTypes(str, childNode, level - 1);
+            }
+        }
+    }
+    const str2 = [];
+    if (options.showBaseType) {
+        dumpBaseTypes(str2, typeNode, level);
+    }
+    /** */
+    if (options.showSubType) {
+        dumpSubtypes(str2, typeNode, level);
+    }
+    if (!options.naked) {
+        dumpNodeByNodeClass(str, nodeRegistry);
+    }
+    str.push(...str2);
+    str.push("}");
+    return str.join("\n");
+}
+exports.dumpClassHierachry = dumpClassHierachry;
+function graphVizToPlantUml(str) {
+    const ttt = "```";
+    return `${ttt}plantuml\n@startuml\n${str}\n@enduml\n${ttt}`;
+}
+exports.graphVizToPlantUml = graphVizToPlantUml;
+function dumpTypeDiagram(namespace) {
+    const objectTypes = [...namespace._objectTypeIterator()];
+    const variableTypes = [...namespace._variableTypeIterator()];
+    const dataTypes = [...namespace._dataTypeIterator()];
+    const referenceTypes = [...namespace._referenceTypeIterator()];
+    const addressSpace = namespace.addressSpace;
+    const str = [];
+    for (const type of [...objectTypes, ...variableTypes]) {
+        const d = opcuaToDot(type);
+        str.push(graphVizToPlantUml(d));
+        const d2 = dumpClassHierachry(type);
+        str.push(graphVizToPlantUml(d2));
+    }
+    for (const dataType of dataTypes) {
+        const d = opcuaToDot(dataType);
+        str.push(graphVizToPlantUml(d));
+    }
+    return str.join("\n");
+}
+exports.dumpTypeDiagram = dumpTypeDiagram;
+//# sourceMappingURL=to_graphivz.js.map

package/dist/to_graphivz.js.map

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

package/examples/make_model.ts

@@ -1,6 +1,10 @@
 // tslint:disable:no-console
 import * as fs from "fs";
 import { promisify } from "util";
+
+
+import { generateAddressSpace } from "node-opcua-address-space/nodeJS";
+import { createBoilerType } from "node-opcua-address-space/testHelpers";
 import {
     AddressSpace,
     DataType,
@@ -15,9 +19,6 @@ import {
 } from "..";
 
 import { getPresetSymbolsFromCSV, saveSymbolsToCSV, buildModel } from "../nodeJS";
-import { generateAddressSpace } from "node-opcua-address-space/nodeJS";
-
-import { createBoilerType } from "node-opcua-address-space/testHelpers";
 
 // node 14 onward : import { writeFile } from "fs/promises";
 const { writeFile } = fs.promises;

package/package.json

@@ -1,53 +1,54 @@
 {
-    "name": "node-opcua-modeler",
-    "version": "2.62.7",
-    "description": "pure nodejs OPCUA SDK - module - model",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "scripts": {
-        "build": "tsc -b",
-        "clean": "node -e \"require('rimraf').sync('dist');\"",
-        "test": "mocha"
-    },
-    "author": "Etienne Rossignon",
-    "license": "MIT",
-    "dependencies": {
-        "chalk": "4.1.2",
-        "cli-table3": "^0.6.0",
-        "csv-parse": "5.0.3",
-        "node-opcua-address-space": "2.62.7",
-        "node-opcua-assert": "2.55.0",
-        "node-opcua-basic-types": "2.62.7",
-        "node-opcua-client-dynamic-extension-object": "2.62.7",
-        "node-opcua-constants": "2.62.7",
-        "node-opcua-data-model": "2.62.7",
-        "node-opcua-factory": "2.62.7",
-        "node-opcua-nodeid": "2.62.7",
-        "node-opcua-nodesets": "2.62.7",
-        "node-opcua-numeric-range": "2.62.7",
-        "node-opcua-schemas": "2.62.7",
-        "node-opcua-service-translate-browse-path": "2.62.7",
-        "node-opcua-status-code": "2.62.7",
-        "node-opcua-types": "2.62.7",
-        "node-opcua-variant": "2.62.7",
-        "node-opcua-xml2json": "2.62.7"
-    },
-    "devDependencies": {
-        "node-opcua-leak-detector": "2.62.7",
-        "should": "^13.2.3"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/node-opcua/node-opcua.git"
-    },
-    "keywords": [
-        "OPCUA",
-        "opcua",
-        "m2m",
-        "iot",
-        "opc ua",
-        "internet of things"
-    ],
-    "homepage": "http://node-opcua.github.io/",
-    "gitHead": "90bb9139261a0edbb531081afcc6904c74e9ee52"
-}
+  "name": "node-opcua-modeler",
+  "version": "2.64.0",
+  "description": "pure nodejs OPCUA SDK - module - model",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "author": "Etienne Rossignon",
+  "license": "MIT",
+  "dependencies": {
+    "chalk": "4.1.2",
+    "cli-table3": "^0.6.1",
+    "csv-parse": "5.0.4",
+    "node-opcua-address-space": "2.64.0",
+    "node-opcua-assert": "2.64.0",
+    "node-opcua-basic-types": "2.64.0",
+    "node-opcua-client-dynamic-extension-object": "2.64.0",
+    "node-opcua-constants": "2.64.0",
+    "node-opcua-data-model": "2.64.0",
+    "node-opcua-factory": "2.64.0",
+    "node-opcua-nodeid": "2.64.0",
+    "node-opcua-nodesets": "2.64.0",
+    "node-opcua-numeric-range": "2.64.0",
+    "node-opcua-schemas": "2.64.0",
+    "node-opcua-service-translate-browse-path": "2.64.0",
+    "node-opcua-status-code": "2.64.0",
+    "node-opcua-types": "2.64.0",
+    "node-opcua-variant": "2.64.0",
+    "node-opcua-xml2json": "2.64.0"
+  },
+  "devDependencies": {
+    "node-opcua-leak-detector": "2.64.0",
+    "should": "^13.2.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/node-opcua/node-opcua.git"
+  },
+  "keywords": [
+    "OPCUA",
+    "opcua",
+    "m2m",
+    "iot",
+    "opc ua",
+    "internet of things"
+  ],
+  "homepage": "http://node-opcua.github.io/",
+  "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c",
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "node -e \"require('rimraf').sync('dist');\"",
+    "test": "mocha"
+  },
+  "readme": "## Node-OPCUA Modeler\n\nNode-opcua-modeler provides a programatic way to conveniently create OPCUA model and nodeset files.\n\n```typescript\nimport {\n    AddressSpace,\n    buildModel,\n    nodesets\n} from \"node-opcua-modeler\";\nimport * as fs from \"fs\";\n\n// the namespaceUri\nconst namespaceUri = \"http://acme.com/Boiler/V0\";\nconst version= \"1.0.0\";\n\n// the nodeset file required by your model\nconst xmlFiles: string[] = [\n    nodesets.standard,\n    nodesets.di\n];\n    \nasync function createModel(addressSpace: AddressSpace): Promise<void> {\n    // create your model here !\n}\n\n(async () => {\n    try {\n        const { markdown, xmlModel, symbols } = await buildModel({\n            namespaceUri,\n            version,\n            xmlFiles,\n            createModel\n        });\n        // save model to a file\n        const nodesetFiename = \"./MyModel.NodeSet2.xml\";\n        await fs.promises.writeFile(nodesetFiename, xmlModel, \"utf-8\");\n\n    } catch (err) {\n        console.log(\"Error\", err);\n    }\n})();\n```\n"
+}