node-opcua-modeler 2.64.1 → 2.66.0

package/distNodeJS/build_documentation_to_file.d.ts

@@ -1,2 +1,3 @@
-import { Namespace } from "node-opcua-address-space";
-export declare function buildDocumentationToFile(namespace: Namespace, filename: string): Promise<void>;
+import { Namespace } from "node-opcua-address-space";
+import { BuildDocumentationOptions } from "..";
+export declare function buildDocumentationToFile(namespace: Namespace, filename: string, options?: BuildDocumentationOptions): Promise<void>;

package/distNodeJS/build_documentation_to_file.js

@@ -1,27 +1,27 @@
-"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.buildDocumentationToFile = void 0;
-const fs = require("fs");
-const __1 = require("..");
-function buildDocumentationToFile(namespace, filename) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const str = yield (0, __1.buildDocumentationToString)(namespace);
-        const stream = fs.createWriteStream("documentation.md");
-        stream.write(str);
-        yield new Promise((resolve) => {
-            stream.on("finish", resolve);
-            stream.end();
-        });
-    });
-}
-exports.buildDocumentationToFile = buildDocumentationToFile;
+"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.buildDocumentationToFile = void 0;
+const fs = require("fs");
+const __1 = require("..");
+function buildDocumentationToFile(namespace, filename, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const str = yield (0, __1.buildDocumentationToString)(namespace, options);
+        const stream = fs.createWriteStream("documentation.md");
+        stream.write(str);
+        yield new Promise((resolve) => {
+            stream.on("finish", resolve);
+            stream.end();
+        });
+    });
+}
+exports.buildDocumentationToFile = buildDocumentationToFile;
 //# sourceMappingURL=build_documentation_to_file.js.map

package/distNodeJS/build_documentation_to_file.js.map

@@ -1 +1 @@
-{"version":3,"file":"build_documentation_to_file.js","sourceRoot":"","sources":["../source_nodejs/build_documentation_to_file.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yBAAyB;AAEzB,0BAAgD;AAEhD,SAAsB,wBAAwB,CAAC,SAAoB,EAAE,QAAgB;;QACjF,MAAM,GAAG,GAAG,MAAM,IAAA,8BAA0B,EAAC,SAAS,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AARD,4DAQC"}
+{"version":3,"file":"build_documentation_to_file.js","sourceRoot":"","sources":["../source_nodejs/build_documentation_to_file.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yBAAyB;AAEzB,0BAA2E;AAE3E,SAAsB,wBAAwB,CAAC,SAAoB,EAAE,QAAgB,EAAE,OAAmC;;QACtH,MAAM,GAAG,GAAG,MAAM,IAAA,8BAA0B,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1B,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AARD,4DAQC"}

package/distNodeJS/build_model.d.ts

@@ -1,7 +1,7 @@
-import { BuildModelOptionsBase } from "..";
-import { Symbols } from "..";
-export declare function buildModel(data: BuildModelOptionsBase): Promise<{
-    markdown: string;
-    xmlModel: string;
-    symbols: Symbols;
-}>;
+import { BuildModelOptionsBase } from "..";
+import { Symbols } from "..";
+export declare function buildModel(data: BuildModelOptionsBase): Promise<{
+    markdown: string;
+    xmlModel: string;
+    symbols: Symbols;
+}>;

package/distNodeJS/build_model.js

@@ -1,22 +1,22 @@
-"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.buildModel = void 0;
-const nodeJS_1 = require("node-opcua-address-space/nodeJS");
-const __1 = require("..");
-function buildModel(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const option1 = Object.assign(Object.assign({}, data), { xmlLoader: nodeJS_1.readNodeSet2XmlFile });
-        return (0, __1.buildModelInner)(option1);
-    });
-}
-exports.buildModel = buildModel;
+"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.buildModel = void 0;
+const nodeJS_1 = require("node-opcua-address-space/nodeJS");
+const __1 = require("..");
+function buildModel(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const option1 = Object.assign(Object.assign({}, data), { xmlLoader: nodeJS_1.readNodeSet2XmlFile });
+        return (0, __1.buildModelInner)(option1);
+    });
+}
+exports.buildModel = buildModel;
 //# sourceMappingURL=build_model.js.map

package/distNodeJS/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./symbol_cvs";
-export * from "./build_model";
-export * from "./build_documentation_to_file";
-export * from "..";
-export { generateAddressSpace } from "node-opcua-address-space/nodeJS";
+export * from "./symbol_cvs";
+export * from "./build_model";
+export * from "./build_documentation_to_file";
+export * from "..";
+export { generateAddressSpace } from "node-opcua-address-space/nodeJS";

package/distNodeJS/index.js

@@ -1,20 +1,24 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAddressSpace = void 0;
-__exportStar(require("./symbol_cvs"), exports);
-__exportStar(require("./build_model"), exports);
-__exportStar(require("./build_documentation_to_file"), exports);
-__exportStar(require(".."), exports);
-var nodeJS_1 = require("node-opcua-address-space/nodeJS");
-Object.defineProperty(exports, "generateAddressSpace", { enumerable: true, get: function () { return nodeJS_1.generateAddressSpace; } });
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateAddressSpace = void 0;
+__exportStar(require("./symbol_cvs"), exports);
+__exportStar(require("./build_model"), exports);
+__exportStar(require("./build_documentation_to_file"), exports);
+__exportStar(require(".."), exports);
+var nodeJS_1 = require("node-opcua-address-space/nodeJS");
+Object.defineProperty(exports, "generateAddressSpace", { enumerable: true, get: function () { return nodeJS_1.generateAddressSpace; } });
 //# sourceMappingURL=index.js.map

package/distNodeJS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source_nodejs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,gDAA8B;AAC9B,gEAA8C;AAC9C,qCAAmB;AACnB,0DAAsE;AAA7D,8GAAA,oBAAoB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../source_nodejs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,gDAA8B;AAC9B,gEAA8C;AAC9C,qCAAmB;AACnB,0DAAsE;AAA7D,8GAAA,oBAAoB,OAAA"}

package/distNodeJS/symbol_cvs.d.ts

@@ -1,3 +1,3 @@
-import { Symbols } from "..";
-export declare function saveSymbolsToCSV(csvFilename: string, symbols: Symbols): Promise<void>;
-export declare function getPresetSymbolsFromCSV(csvFilename: string): Promise<Symbols>;
+import { Symbols } from "..";
+export declare function saveSymbolsToCSV(csvFilename: string, symbols: Symbols): Promise<void>;
+export declare function getPresetSymbolsFromCSV(csvFilename: string): Promise<Symbols>;

package/distNodeJS/symbol_cvs.js

@@ -1,64 +1,64 @@
-"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.getPresetSymbolsFromCSV = exports.saveSymbolsToCSV = void 0;
-const fs = require("fs");
-const csv_parse_1 = require("csv-parse");
-const __1 = require("..");
-// node 14 onward : import { readFile, writeFile } from "fs/promises";
-const { readFile, writeFile } = fs.promises;
-function saveSymbolsToCSV(csvFilename, symbols) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield writeFile(csvFilename, (0, __1.toCSV)(symbols), "utf-8");
-    });
-}
-exports.saveSymbolsToCSV = saveSymbolsToCSV;
-function getPresetSymbolsFromCSV(csvFilename) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs.existsSync(csvFilename)) {
-            return [];
-        }
-        try {
-            const data = yield readFile(csvFilename, "utf-8");
-            const records = yield new Promise((resolve) => {
-                const output = [];
-                (0, csv_parse_1.parse)(data, {
-                    cast: (value, context) => {
-                        if (context.index === 1) {
-                            return parseInt(value, 10);
-                        }
-                        return value;
-                    }
-                })
-                    .on("readable", function () {
-                    let record = this.read();
-                    while (record) {
-                        output.push(record);
-                        record = this.read();
-                    }
-                })
-                    .on("end", () => {
-                    resolve(output);
-                });
-            });
-            return records;
-        }
-        catch (err) {
-            if (err instanceof Error) {
-                // tslint:disable-next-line: no-console
-                console.log("getPresetSymbols err = ", err.message);
-            }
-            return [];
-        }
-    });
-}
-exports.getPresetSymbolsFromCSV = getPresetSymbolsFromCSV;
+"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.getPresetSymbolsFromCSV = exports.saveSymbolsToCSV = void 0;
+const fs = require("fs");
+const csv_parse_1 = require("csv-parse");
+const __1 = require("..");
+// node 14 onward : import { readFile, writeFile } from "fs/promises";
+const { readFile, writeFile } = fs.promises;
+function saveSymbolsToCSV(csvFilename, symbols) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield writeFile(csvFilename, (0, __1.toCSV)(symbols), "utf-8");
+    });
+}
+exports.saveSymbolsToCSV = saveSymbolsToCSV;
+function getPresetSymbolsFromCSV(csvFilename) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!fs.existsSync(csvFilename)) {
+            return [];
+        }
+        try {
+            const data = yield readFile(csvFilename, "utf-8");
+            const records = yield new Promise((resolve) => {
+                const output = [];
+                (0, csv_parse_1.parse)(data, {
+                    cast: (value, context) => {
+                        if (context.index === 1) {
+                            return parseInt(value, 10);
+                        }
+                        return value;
+                    }
+                })
+                    .on("readable", function () {
+                    let record = this.read();
+                    while (record) {
+                        output.push(record);
+                        record = this.read();
+                    }
+                })
+                    .on("end", () => {
+                    resolve(output);
+                });
+            });
+            return records;
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                // tslint:disable-next-line: no-console
+                console.log("getPresetSymbols err = ", err.message);
+            }
+            return [];
+        }
+    });
+}
+exports.getPresetSymbolsFromCSV = getPresetSymbolsFromCSV;
 //# sourceMappingURL=symbol_cvs.js.map

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "node-opcua-modeler",
-    "version": "2.64.1",
+    "version": "2.66.0",
     "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');\"",
+        "clean": "npx rimraf dist *.tsbuildinfo",
         "test": "mocha"
     },
     "author": "Etienne Rossignon",
@@ -15,25 +15,25 @@
         "chalk": "4.1.2",
         "cli-table3": "^0.6.1",
         "csv-parse": "5.0.4",
-        "node-opcua-address-space": "2.64.1",
-        "node-opcua-assert": "2.64.1",
-        "node-opcua-basic-types": "2.64.1",
-        "node-opcua-client-dynamic-extension-object": "2.64.1",
-        "node-opcua-constants": "2.64.1",
-        "node-opcua-data-model": "2.64.1",
-        "node-opcua-factory": "2.64.1",
-        "node-opcua-nodeid": "2.64.1",
-        "node-opcua-nodesets": "2.64.1",
-        "node-opcua-numeric-range": "2.64.1",
-        "node-opcua-schemas": "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-variant": "2.64.1",
-        "node-opcua-xml2json": "2.64.1"
+        "node-opcua-address-space": "2.66.0",
+        "node-opcua-assert": "2.66.0",
+        "node-opcua-basic-types": "2.66.0",
+        "node-opcua-client-dynamic-extension-object": "2.66.0",
+        "node-opcua-constants": "2.66.0",
+        "node-opcua-data-model": "2.66.0",
+        "node-opcua-factory": "2.66.0",
+        "node-opcua-nodeid": "2.66.0",
+        "node-opcua-nodesets": "2.66.0",
+        "node-opcua-numeric-range": "2.66.0",
+        "node-opcua-schemas": "2.66.0",
+        "node-opcua-service-translate-browse-path": "2.66.0",
+        "node-opcua-status-code": "2.66.0",
+        "node-opcua-types": "2.66.0",
+        "node-opcua-variant": "2.66.0",
+        "node-opcua-xml2json": "2.66.0"
     },
     "devDependencies": {
-        "node-opcua-leak-detector": "2.64.1",
+        "node-opcua-leak-detector": "2.66.0",
         "should": "^13.2.3"
     },
     "repository": {
@@ -49,5 +49,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
+    "gitHead": "97f47e2e242a1fd737495fd64cb65e8fb7a9964b"
 }

package/source/build_model_inner.ts

@@ -1,6 +1,4 @@
-import { 
-    AddressSpace, 
-    Namespace, NodeIdManager, XmlLoaderFunc, generateAddressSpaceRaw } from "node-opcua-address-space";
+import { AddressSpace, NodeIdManager, XmlLoaderAsyncFunc, generateAddressSpaceRaw } from "node-opcua-address-space";
 import { buildDocumentationToString } from "./generate_markdown_doc";
 import { Symbols } from "./symbol";
 
@@ -12,7 +10,7 @@ export interface BuildModelOptionsBase {
     presetSymbols?: Symbols;
 }
 export interface BuildModelOptions extends BuildModelOptionsBase {
-    xmlLoader: XmlLoaderFunc;
+    xmlLoader: XmlLoaderAsyncFunc;
 }
 
 export async function buildModelInner(data: BuildModelOptions): Promise<{ markdown: string; xmlModel: string; symbols: Symbols }> {
@@ -33,7 +31,7 @@ export async function buildModelInner(data: BuildModelOptions): Promise<{ markdo
 
         const xmlModel = ns.toNodeset2XML();
         const symbols = nodeIdManager.getSymbols();
-        const doc = await buildDocumentationToString(ns);
+        const doc = await buildDocumentationToString(ns, {});
         addressSpace.dispose();
 
         return { xmlModel, symbols, markdown: doc };

package/source/displayNodeElement.ts

@@ -147,7 +147,9 @@ function dumpReferences(data: Data, _references: UAReference[]) {
         dumpReference(data, ref, "Organizes");
     }
     for (const ref of _references) {
-        console.log(data.node!.addressSpace!.findReferenceType(ref.referenceType)!.toString());
+        dumpReference(data, ref, "HasInterface");
+    }
+    for (const ref of _references) {
         dumpReference(data, ref, undefined);
     }
 }
@@ -181,8 +183,6 @@ export function displayNodeElement(node: BaseNode, options?: DisplayNodeOptions)
 
     const references = node.allReferences();
 
-    const m = {};
-
     const data = { table, node, alreadyDumped, descriptions };
     dumpReferences(data, references);